diff --git a/.github/labeler-config-srvaroa.yml b/.github/labeler-config-srvaroa.yml index a7218cdcf..6b554e403 100644 --- a/.github/labeler-config-srvaroa.yml +++ b/.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' diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b064d584b..aa98d2a1e 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/.gitignore b/.gitignore index 7238f8897..bbc43feb1 100644 --- a/.gitignore +++ b/.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__/ diff --git a/.vscode/settings.json b/.vscode/settings.json index d2e7c5e39..f992feace 100644 --- a/.vscode/settings.json +++ b/.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" ] } diff --git a/Dockerfile.fat b/Dockerfile.fat index 791c8976a..58d7164a3 100644 --- a/Dockerfile.fat +++ b/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 diff --git a/LICENSE b/LICENSE index 877663171..cc732d7ea 100644 --- a/LICENSE +++ b/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. diff --git a/common/.gitignore b/app/common/.gitignore similarity index 99% rename from common/.gitignore rename to app/common/.gitignore index 17f0d4976..bd6361c88 100644 --- a/common/.gitignore +++ b/app/common/.gitignore @@ -124,7 +124,7 @@ SwaggerDoc.json *.rar *.db /build -/common/build/ +/app/common/build/ # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/common/build.gradle b/app/common/build.gradle similarity index 100% rename from common/build.gradle rename to app/common/build.gradle diff --git a/common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java b/app/common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java similarity index 100% rename from common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java rename to app/common/src/main/java/org/apache/pdfbox/examples/util/DeletingRandomAccessFile.java diff --git a/common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java b/app/common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java similarity index 100% rename from common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java rename to app/common/src/main/java/stirling/software/common/annotations/AutoJobPostMapping.java diff --git a/common/src/main/java/stirling/software/common/aop/AutoJobAspect.java b/app/common/src/main/java/stirling/software/common/aop/AutoJobAspect.java similarity index 100% rename from common/src/main/java/stirling/software/common/aop/AutoJobAspect.java rename to app/common/src/main/java/stirling/software/common/aop/AutoJobAspect.java diff --git a/common/src/main/java/stirling/software/common/config/TempFileConfiguration.java b/app/common/src/main/java/stirling/software/common/config/TempFileConfiguration.java similarity index 100% rename from common/src/main/java/stirling/software/common/config/TempFileConfiguration.java rename to app/common/src/main/java/stirling/software/common/config/TempFileConfiguration.java diff --git a/common/src/main/java/stirling/software/common/config/TempFileShutdownHook.java b/app/common/src/main/java/stirling/software/common/config/TempFileShutdownHook.java similarity index 97% rename from common/src/main/java/stirling/software/common/config/TempFileShutdownHook.java rename to app/common/src/main/java/stirling/software/common/config/TempFileShutdownHook.java index 6fd3bdeff..00719deaa 100644 --- a/common/src/main/java/stirling/software/common/config/TempFileShutdownHook.java +++ b/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; diff --git a/common/src/main/java/stirling/software/common/configuration/AppConfig.java b/app/common/src/main/java/stirling/software/common/configuration/AppConfig.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/AppConfig.java rename to app/common/src/main/java/stirling/software/common/configuration/AppConfig.java diff --git a/common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java b/app/common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java rename to app/common/src/main/java/stirling/software/common/configuration/ConfigInitializer.java diff --git a/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java b/app/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java rename to app/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java diff --git a/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java b/app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java rename to app/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java diff --git a/common/src/main/java/stirling/software/common/configuration/PostHogConfig.java b/app/common/src/main/java/stirling/software/common/configuration/PostHogConfig.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/PostHogConfig.java rename to app/common/src/main/java/stirling/software/common/configuration/PostHogConfig.java diff --git a/common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java b/app/common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java rename to app/common/src/main/java/stirling/software/common/configuration/PostHogLoggerImpl.java diff --git a/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java b/app/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java rename to app/common/src/main/java/stirling/software/common/configuration/RuntimePathConfig.java diff --git a/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java b/app/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java rename to app/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java diff --git a/common/src/main/java/stirling/software/common/configuration/interfaces/ShowAdminInterface.java b/app/common/src/main/java/stirling/software/common/configuration/interfaces/ShowAdminInterface.java similarity index 100% rename from common/src/main/java/stirling/software/common/configuration/interfaces/ShowAdminInterface.java rename to app/common/src/main/java/stirling/software/common/configuration/interfaces/ShowAdminInterface.java diff --git a/common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/ApplicationProperties.java rename to app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java diff --git a/common/src/main/java/stirling/software/common/model/FileInfo.java b/app/common/src/main/java/stirling/software/common/model/FileInfo.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/FileInfo.java rename to app/common/src/main/java/stirling/software/common/model/FileInfo.java diff --git a/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java b/app/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java rename to app/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java diff --git a/common/src/main/java/stirling/software/common/model/PdfMetadata.java b/app/common/src/main/java/stirling/software/common/model/PdfMetadata.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/PdfMetadata.java rename to app/common/src/main/java/stirling/software/common/model/PdfMetadata.java diff --git a/common/src/main/java/stirling/software/common/model/api/GeneralFile.java b/app/common/src/main/java/stirling/software/common/model/api/GeneralFile.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/api/GeneralFile.java rename to app/common/src/main/java/stirling/software/common/model/api/GeneralFile.java diff --git a/common/src/main/java/stirling/software/common/model/api/PDFFile.java b/app/common/src/main/java/stirling/software/common/model/api/PDFFile.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/api/PDFFile.java rename to app/common/src/main/java/stirling/software/common/model/api/PDFFile.java diff --git a/common/src/main/java/stirling/software/common/model/api/converters/EmlToPdfRequest.java b/app/common/src/main/java/stirling/software/common/model/api/converters/EmlToPdfRequest.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/api/converters/EmlToPdfRequest.java rename to app/common/src/main/java/stirling/software/common/model/api/converters/EmlToPdfRequest.java diff --git a/common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java b/app/common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java rename to app/common/src/main/java/stirling/software/common/model/api/converters/HTMLToPdfRequest.java diff --git a/common/src/main/java/stirling/software/common/model/api/misc/HighContrastColorCombination.java b/app/common/src/main/java/stirling/software/common/model/api/misc/HighContrastColorCombination.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/api/misc/HighContrastColorCombination.java rename to app/common/src/main/java/stirling/software/common/model/api/misc/HighContrastColorCombination.java diff --git a/common/src/main/java/stirling/software/common/model/api/misc/ReplaceAndInvert.java b/app/common/src/main/java/stirling/software/common/model/api/misc/ReplaceAndInvert.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/api/misc/ReplaceAndInvert.java rename to app/common/src/main/java/stirling/software/common/model/api/misc/ReplaceAndInvert.java diff --git a/common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java b/app/common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java rename to app/common/src/main/java/stirling/software/common/model/api/security/RedactionArea.java diff --git a/common/src/main/java/stirling/software/common/model/enumeration/Role.java b/app/common/src/main/java/stirling/software/common/model/enumeration/Role.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/enumeration/Role.java rename to app/common/src/main/java/stirling/software/common/model/enumeration/Role.java diff --git a/common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java b/app/common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java rename to app/common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java diff --git a/common/src/main/java/stirling/software/common/model/exception/UnsupportedClaimException.java b/app/common/src/main/java/stirling/software/common/model/exception/UnsupportedClaimException.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/exception/UnsupportedClaimException.java rename to app/common/src/main/java/stirling/software/common/model/exception/UnsupportedClaimException.java diff --git a/common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java b/app/common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java rename to app/common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java diff --git a/common/src/main/java/stirling/software/common/model/job/JobProgress.java b/app/common/src/main/java/stirling/software/common/model/job/JobProgress.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/job/JobProgress.java rename to app/common/src/main/java/stirling/software/common/model/job/JobProgress.java diff --git a/common/src/main/java/stirling/software/common/model/job/JobResponse.java b/app/common/src/main/java/stirling/software/common/model/job/JobResponse.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/job/JobResponse.java rename to app/common/src/main/java/stirling/software/common/model/job/JobResponse.java diff --git a/common/src/main/java/stirling/software/common/model/job/JobResult.java b/app/common/src/main/java/stirling/software/common/model/job/JobResult.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/job/JobResult.java rename to app/common/src/main/java/stirling/software/common/model/job/JobResult.java diff --git a/common/src/main/java/stirling/software/common/model/job/JobStats.java b/app/common/src/main/java/stirling/software/common/model/job/JobStats.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/job/JobStats.java rename to app/common/src/main/java/stirling/software/common/model/job/JobStats.java diff --git a/common/src/main/java/stirling/software/common/model/job/ResultFile.java b/app/common/src/main/java/stirling/software/common/model/job/ResultFile.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/job/ResultFile.java rename to app/common/src/main/java/stirling/software/common/model/job/ResultFile.java diff --git a/common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java b/app/common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java rename to app/common/src/main/java/stirling/software/common/model/oauth2/GitHubProvider.java diff --git a/common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java b/app/common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java rename to app/common/src/main/java/stirling/software/common/model/oauth2/GoogleProvider.java diff --git a/common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java b/app/common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java rename to app/common/src/main/java/stirling/software/common/model/oauth2/KeycloakProvider.java diff --git a/common/src/main/java/stirling/software/common/model/oauth2/Provider.java b/app/common/src/main/java/stirling/software/common/model/oauth2/Provider.java similarity index 100% rename from common/src/main/java/stirling/software/common/model/oauth2/Provider.java rename to app/common/src/main/java/stirling/software/common/model/oauth2/Provider.java diff --git a/common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java b/app/common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java rename to app/common/src/main/java/stirling/software/common/service/CustomPDFDocumentFactory.java diff --git a/common/src/main/java/stirling/software/common/service/FileOrUploadService.java b/app/common/src/main/java/stirling/software/common/service/FileOrUploadService.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/FileOrUploadService.java rename to app/common/src/main/java/stirling/software/common/service/FileOrUploadService.java diff --git a/common/src/main/java/stirling/software/common/service/FileStorage.java b/app/common/src/main/java/stirling/software/common/service/FileStorage.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/FileStorage.java rename to app/common/src/main/java/stirling/software/common/service/FileStorage.java diff --git a/common/src/main/java/stirling/software/common/service/JobExecutorService.java b/app/common/src/main/java/stirling/software/common/service/JobExecutorService.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/JobExecutorService.java rename to app/common/src/main/java/stirling/software/common/service/JobExecutorService.java diff --git a/common/src/main/java/stirling/software/common/service/JobQueue.java b/app/common/src/main/java/stirling/software/common/service/JobQueue.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/JobQueue.java rename to app/common/src/main/java/stirling/software/common/service/JobQueue.java diff --git a/common/src/main/java/stirling/software/common/service/PdfMetadataService.java b/app/common/src/main/java/stirling/software/common/service/PdfMetadataService.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/PdfMetadataService.java rename to app/common/src/main/java/stirling/software/common/service/PdfMetadataService.java diff --git a/common/src/main/java/stirling/software/common/service/PostHogService.java b/app/common/src/main/java/stirling/software/common/service/PostHogService.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/PostHogService.java rename to app/common/src/main/java/stirling/software/common/service/PostHogService.java diff --git a/common/src/main/java/stirling/software/common/service/ResourceMonitor.java b/app/common/src/main/java/stirling/software/common/service/ResourceMonitor.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/ResourceMonitor.java rename to app/common/src/main/java/stirling/software/common/service/ResourceMonitor.java diff --git a/common/src/main/java/stirling/software/common/service/TaskManager.java b/app/common/src/main/java/stirling/software/common/service/TaskManager.java similarity index 99% rename from common/src/main/java/stirling/software/common/service/TaskManager.java rename to app/common/src/main/java/stirling/software/common/service/TaskManager.java index 219ae4ac4..902b2bfd1 100644 --- a/common/src/main/java/stirling/software/common/service/TaskManager.java +++ b/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()) { diff --git a/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java b/app/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/TempFileCleanupService.java rename to app/common/src/main/java/stirling/software/common/service/TempFileCleanupService.java diff --git a/common/src/main/java/stirling/software/common/service/UserServiceInterface.java b/app/common/src/main/java/stirling/software/common/service/UserServiceInterface.java similarity index 100% rename from common/src/main/java/stirling/software/common/service/UserServiceInterface.java rename to app/common/src/main/java/stirling/software/common/service/UserServiceInterface.java diff --git a/common/src/main/java/stirling/software/common/util/ApplicationContextProvider.java b/app/common/src/main/java/stirling/software/common/util/ApplicationContextProvider.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ApplicationContextProvider.java rename to app/common/src/main/java/stirling/software/common/util/ApplicationContextProvider.java diff --git a/common/src/main/java/stirling/software/common/util/AttachmentUtils.java b/app/common/src/main/java/stirling/software/common/util/AttachmentUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/AttachmentUtils.java rename to app/common/src/main/java/stirling/software/common/util/AttachmentUtils.java diff --git a/common/src/main/java/stirling/software/common/util/CheckProgramInstall.java b/app/common/src/main/java/stirling/software/common/util/CheckProgramInstall.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/CheckProgramInstall.java rename to app/common/src/main/java/stirling/software/common/util/CheckProgramInstall.java diff --git a/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java b/app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java rename to app/common/src/main/java/stirling/software/common/util/CustomHtmlSanitizer.java diff --git a/common/src/main/java/stirling/software/common/util/EmlToPdf.java b/app/common/src/main/java/stirling/software/common/util/EmlToPdf.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/EmlToPdf.java rename to app/common/src/main/java/stirling/software/common/util/EmlToPdf.java diff --git a/common/src/main/java/stirling/software/common/util/ErrorUtils.java b/app/common/src/main/java/stirling/software/common/util/ErrorUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ErrorUtils.java rename to app/common/src/main/java/stirling/software/common/util/ErrorUtils.java diff --git a/common/src/main/java/stirling/software/common/util/ExceptionUtils.java b/app/common/src/main/java/stirling/software/common/util/ExceptionUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ExceptionUtils.java rename to app/common/src/main/java/stirling/software/common/util/ExceptionUtils.java diff --git a/common/src/main/java/stirling/software/common/util/ExecutorFactory.java b/app/common/src/main/java/stirling/software/common/util/ExecutorFactory.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ExecutorFactory.java rename to app/common/src/main/java/stirling/software/common/util/ExecutorFactory.java diff --git a/common/src/main/java/stirling/software/common/util/FileMonitor.java b/app/common/src/main/java/stirling/software/common/util/FileMonitor.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/FileMonitor.java rename to app/common/src/main/java/stirling/software/common/util/FileMonitor.java diff --git a/common/src/main/java/stirling/software/common/util/FileToPdf.java b/app/common/src/main/java/stirling/software/common/util/FileToPdf.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/FileToPdf.java rename to app/common/src/main/java/stirling/software/common/util/FileToPdf.java diff --git a/common/src/main/java/stirling/software/common/util/GeneralUtils.java b/app/common/src/main/java/stirling/software/common/util/GeneralUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/GeneralUtils.java rename to app/common/src/main/java/stirling/software/common/util/GeneralUtils.java diff --git a/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java b/app/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java rename to app/common/src/main/java/stirling/software/common/util/ImageProcessingUtils.java diff --git a/common/src/main/java/stirling/software/common/util/PDFToFile.java b/app/common/src/main/java/stirling/software/common/util/PDFToFile.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/PDFToFile.java rename to app/common/src/main/java/stirling/software/common/util/PDFToFile.java diff --git a/common/src/main/java/stirling/software/common/util/PdfErrorUtils.java b/app/common/src/main/java/stirling/software/common/util/PdfErrorUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/PdfErrorUtils.java rename to app/common/src/main/java/stirling/software/common/util/PdfErrorUtils.java diff --git a/common/src/main/java/stirling/software/common/util/PdfUtils.java b/app/common/src/main/java/stirling/software/common/util/PdfUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/PdfUtils.java rename to app/common/src/main/java/stirling/software/common/util/PdfUtils.java diff --git a/common/src/main/java/stirling/software/common/util/ProcessExecutor.java b/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ProcessExecutor.java rename to app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java diff --git a/common/src/main/java/stirling/software/common/util/PropertyConfigs.java b/app/common/src/main/java/stirling/software/common/util/PropertyConfigs.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/PropertyConfigs.java rename to app/common/src/main/java/stirling/software/common/util/PropertyConfigs.java diff --git a/common/src/main/java/stirling/software/common/util/ProviderUtils.java b/app/common/src/main/java/stirling/software/common/util/ProviderUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ProviderUtils.java rename to app/common/src/main/java/stirling/software/common/util/ProviderUtils.java diff --git a/common/src/main/java/stirling/software/common/util/RequestUriUtils.java b/app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/RequestUriUtils.java rename to app/common/src/main/java/stirling/software/common/util/RequestUriUtils.java diff --git a/common/src/main/java/stirling/software/common/util/SpringContextHolder.java b/app/common/src/main/java/stirling/software/common/util/SpringContextHolder.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/SpringContextHolder.java rename to app/common/src/main/java/stirling/software/common/util/SpringContextHolder.java diff --git a/common/src/main/java/stirling/software/common/util/TempDirectory.java b/app/common/src/main/java/stirling/software/common/util/TempDirectory.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/TempDirectory.java rename to app/common/src/main/java/stirling/software/common/util/TempDirectory.java diff --git a/common/src/main/java/stirling/software/common/util/TempFile.java b/app/common/src/main/java/stirling/software/common/util/TempFile.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/TempFile.java rename to app/common/src/main/java/stirling/software/common/util/TempFile.java diff --git a/common/src/main/java/stirling/software/common/util/TempFileManager.java b/app/common/src/main/java/stirling/software/common/util/TempFileManager.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/TempFileManager.java rename to app/common/src/main/java/stirling/software/common/util/TempFileManager.java diff --git a/common/src/main/java/stirling/software/common/util/TempFileRegistry.java b/app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/TempFileRegistry.java rename to app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java diff --git a/common/src/main/java/stirling/software/common/util/TempFileUtil.java b/app/common/src/main/java/stirling/software/common/util/TempFileUtil.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/TempFileUtil.java rename to app/common/src/main/java/stirling/software/common/util/TempFileUtil.java diff --git a/common/src/main/java/stirling/software/common/util/UIScaling.java b/app/common/src/main/java/stirling/software/common/util/UIScaling.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/UIScaling.java rename to app/common/src/main/java/stirling/software/common/util/UIScaling.java diff --git a/common/src/main/java/stirling/software/common/util/UrlUtils.java b/app/common/src/main/java/stirling/software/common/util/UrlUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/UrlUtils.java rename to app/common/src/main/java/stirling/software/common/util/UrlUtils.java diff --git a/common/src/main/java/stirling/software/common/util/ValidationUtil.java b/app/common/src/main/java/stirling/software/common/util/ValidationUtil.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ValidationUtil.java rename to app/common/src/main/java/stirling/software/common/util/ValidationUtil.java diff --git a/common/src/main/java/stirling/software/common/util/ValidationUtils.java b/app/common/src/main/java/stirling/software/common/util/ValidationUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/ValidationUtils.java rename to app/common/src/main/java/stirling/software/common/util/ValidationUtils.java diff --git a/common/src/main/java/stirling/software/common/util/WebResponseUtils.java b/app/common/src/main/java/stirling/software/common/util/WebResponseUtils.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/WebResponseUtils.java rename to app/common/src/main/java/stirling/software/common/util/WebResponseUtils.java diff --git a/common/src/main/java/stirling/software/common/util/YamlHelper.java b/app/common/src/main/java/stirling/software/common/util/YamlHelper.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/YamlHelper.java rename to app/common/src/main/java/stirling/software/common/util/YamlHelper.java diff --git a/common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java b/app/common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java rename to app/common/src/main/java/stirling/software/common/util/misc/CustomColorReplaceStrategy.java diff --git a/common/src/main/java/stirling/software/common/util/misc/HighContrastColorReplaceDecider.java b/app/common/src/main/java/stirling/software/common/util/misc/HighContrastColorReplaceDecider.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/misc/HighContrastColorReplaceDecider.java rename to app/common/src/main/java/stirling/software/common/util/misc/HighContrastColorReplaceDecider.java diff --git a/common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java b/app/common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java rename to app/common/src/main/java/stirling/software/common/util/misc/InvertFullColorStrategy.java diff --git a/common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java b/app/common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java rename to app/common/src/main/java/stirling/software/common/util/misc/PdfTextStripperCustom.java diff --git a/common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java b/app/common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java rename to app/common/src/main/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategy.java diff --git a/common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java b/app/common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java rename to app/common/src/main/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditor.java diff --git a/common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java b/app/common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java similarity index 100% rename from common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java rename to app/common/src/main/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditor.java diff --git a/common/src/test/java/stirling/software/common/annotations/AutoJobPostMappingIntegrationTest.java b/app/common/src/test/java/stirling/software/common/annotations/AutoJobPostMappingIntegrationTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/annotations/AutoJobPostMappingIntegrationTest.java rename to app/common/src/test/java/stirling/software/common/annotations/AutoJobPostMappingIntegrationTest.java diff --git a/common/src/test/java/stirling/software/common/service/CustomPDFDocumentFactoryTest.java b/app/common/src/test/java/stirling/software/common/service/CustomPDFDocumentFactoryTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/CustomPDFDocumentFactoryTest.java rename to app/common/src/test/java/stirling/software/common/service/CustomPDFDocumentFactoryTest.java diff --git a/common/src/test/java/stirling/software/common/service/FileStorageTest.java b/app/common/src/test/java/stirling/software/common/service/FileStorageTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/FileStorageTest.java rename to app/common/src/test/java/stirling/software/common/service/FileStorageTest.java diff --git a/common/src/test/java/stirling/software/common/service/JobExecutorServiceTest.java b/app/common/src/test/java/stirling/software/common/service/JobExecutorServiceTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/JobExecutorServiceTest.java rename to app/common/src/test/java/stirling/software/common/service/JobExecutorServiceTest.java diff --git a/common/src/test/java/stirling/software/common/service/JobQueueTest.java b/app/common/src/test/java/stirling/software/common/service/JobQueueTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/JobQueueTest.java rename to app/common/src/test/java/stirling/software/common/service/JobQueueTest.java diff --git a/common/src/test/java/stirling/software/common/service/ResourceMonitorTest.java b/app/common/src/test/java/stirling/software/common/service/ResourceMonitorTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/ResourceMonitorTest.java rename to app/common/src/test/java/stirling/software/common/service/ResourceMonitorTest.java diff --git a/common/src/test/java/stirling/software/common/service/SpyPDFDocumentFactory.java b/app/common/src/test/java/stirling/software/common/service/SpyPDFDocumentFactory.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/SpyPDFDocumentFactory.java rename to app/common/src/test/java/stirling/software/common/service/SpyPDFDocumentFactory.java diff --git a/common/src/test/java/stirling/software/common/service/TaskManagerTest.java b/app/common/src/test/java/stirling/software/common/service/TaskManagerTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/TaskManagerTest.java rename to app/common/src/test/java/stirling/software/common/service/TaskManagerTest.java diff --git a/common/src/test/java/stirling/software/common/service/TempFileCleanupServiceTest.java b/app/common/src/test/java/stirling/software/common/service/TempFileCleanupServiceTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/service/TempFileCleanupServiceTest.java rename to app/common/src/test/java/stirling/software/common/service/TempFileCleanupServiceTest.java diff --git a/common/src/test/java/stirling/software/common/util/CheckProgramInstallTest.java b/app/common/src/test/java/stirling/software/common/util/CheckProgramInstallTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/CheckProgramInstallTest.java rename to app/common/src/test/java/stirling/software/common/util/CheckProgramInstallTest.java diff --git a/common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java b/app/common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java rename to app/common/src/test/java/stirling/software/common/util/CustomHtmlSanitizerTest.java diff --git a/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java b/app/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/EmlToPdfTest.java rename to app/common/src/test/java/stirling/software/common/util/EmlToPdfTest.java diff --git a/common/src/test/java/stirling/software/common/util/ErrorUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/ErrorUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/ErrorUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/ErrorUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/FileInfoTest.java b/app/common/src/test/java/stirling/software/common/util/FileInfoTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/FileInfoTest.java rename to app/common/src/test/java/stirling/software/common/util/FileInfoTest.java diff --git a/common/src/test/java/stirling/software/common/util/FileMonitorTest.java b/app/common/src/test/java/stirling/software/common/util/FileMonitorTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/FileMonitorTest.java rename to app/common/src/test/java/stirling/software/common/util/FileMonitorTest.java diff --git a/common/src/test/java/stirling/software/common/util/FileToPdfTest.java b/app/common/src/test/java/stirling/software/common/util/FileToPdfTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/FileToPdfTest.java rename to app/common/src/test/java/stirling/software/common/util/FileToPdfTest.java diff --git a/common/src/test/java/stirling/software/common/util/GeneralUtilsAdditionalTest.java b/app/common/src/test/java/stirling/software/common/util/GeneralUtilsAdditionalTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/GeneralUtilsAdditionalTest.java rename to app/common/src/test/java/stirling/software/common/util/GeneralUtilsAdditionalTest.java diff --git a/common/src/test/java/stirling/software/common/util/GeneralUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/GeneralUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/GeneralUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/GeneralUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/ImageProcessingUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/ImageProcessingUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/ImageProcessingUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/ImageProcessingUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/PDFToFileTest.java b/app/common/src/test/java/stirling/software/common/util/PDFToFileTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/PDFToFileTest.java rename to app/common/src/test/java/stirling/software/common/util/PDFToFileTest.java diff --git a/common/src/test/java/stirling/software/common/util/PdfUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/PdfUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/PdfUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/PdfUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/ProcessExecutorTest.java b/app/common/src/test/java/stirling/software/common/util/ProcessExecutorTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/ProcessExecutorTest.java rename to app/common/src/test/java/stirling/software/common/util/ProcessExecutorTest.java diff --git a/common/src/test/java/stirling/software/common/util/PropertyConfigsTest.java b/app/common/src/test/java/stirling/software/common/util/PropertyConfigsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/PropertyConfigsTest.java rename to app/common/src/test/java/stirling/software/common/util/PropertyConfigsTest.java diff --git a/common/src/test/java/stirling/software/common/util/ProviderUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/ProviderUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/ProviderUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/ProviderUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/RequestUriUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/SpringContextHolderTest.java b/app/common/src/test/java/stirling/software/common/util/SpringContextHolderTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/SpringContextHolderTest.java rename to app/common/src/test/java/stirling/software/common/util/SpringContextHolderTest.java diff --git a/common/src/test/java/stirling/software/common/util/UIScalingTest.java b/app/common/src/test/java/stirling/software/common/util/UIScalingTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/UIScalingTest.java rename to app/common/src/test/java/stirling/software/common/util/UIScalingTest.java diff --git a/common/src/test/java/stirling/software/common/util/UrlUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/UrlUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/UrlUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/UrlUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/WebResponseUtilsTest.java b/app/common/src/test/java/stirling/software/common/util/WebResponseUtilsTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/WebResponseUtilsTest.java rename to app/common/src/test/java/stirling/software/common/util/WebResponseUtilsTest.java diff --git a/common/src/test/java/stirling/software/common/util/misc/CustomColorReplaceStrategyTest.java b/app/common/src/test/java/stirling/software/common/util/misc/CustomColorReplaceStrategyTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/misc/CustomColorReplaceStrategyTest.java rename to app/common/src/test/java/stirling/software/common/util/misc/CustomColorReplaceStrategyTest.java diff --git a/common/src/test/java/stirling/software/common/util/misc/HighContrastColorReplaceDeciderTest.java b/app/common/src/test/java/stirling/software/common/util/misc/HighContrastColorReplaceDeciderTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/misc/HighContrastColorReplaceDeciderTest.java rename to app/common/src/test/java/stirling/software/common/util/misc/HighContrastColorReplaceDeciderTest.java diff --git a/common/src/test/java/stirling/software/common/util/misc/InvertFullColorStrategyTest.java b/app/common/src/test/java/stirling/software/common/util/misc/InvertFullColorStrategyTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/misc/InvertFullColorStrategyTest.java rename to app/common/src/test/java/stirling/software/common/util/misc/InvertFullColorStrategyTest.java diff --git a/common/src/test/java/stirling/software/common/util/misc/PdfTextStripperCustomTest.java b/app/common/src/test/java/stirling/software/common/util/misc/PdfTextStripperCustomTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/misc/PdfTextStripperCustomTest.java rename to app/common/src/test/java/stirling/software/common/util/misc/PdfTextStripperCustomTest.java diff --git a/common/src/test/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategyTest.java b/app/common/src/test/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategyTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategyTest.java rename to app/common/src/test/java/stirling/software/common/util/misc/ReplaceAndInvertColorStrategyTest.java diff --git a/common/src/test/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditorTest.java b/app/common/src/test/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditorTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditorTest.java rename to app/common/src/test/java/stirling/software/common/util/propertyeditor/StringToArrayListPropertyEditorTest.java diff --git a/common/src/test/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditorTest.java b/app/common/src/test/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditorTest.java similarity index 100% rename from common/src/test/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditorTest.java rename to app/common/src/test/java/stirling/software/common/util/propertyeditor/StringToMapPropertyEditorTest.java diff --git a/common/src/test/resources/example.pdf b/app/common/src/test/resources/example.pdf similarity index 100% rename from common/src/test/resources/example.pdf rename to app/common/src/test/resources/example.pdf diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java index e7dfba041..21fd61d11 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java @@ -10,7 +10,6 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.common.PDStream; import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; import org.apache.pdfbox.pdmodel.interactive.form.PDField; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; @@ -34,7 +33,6 @@ import stirling.software.common.util.WebResponseUtils; public class UnlockPDFFormsController { private final CustomPDFDocumentFactory pdfDocumentFactory; - @Autowired public UnlockPDFFormsController(CustomPDFDocumentFactory pdfDocumentFactory) { this.pdfDocumentFactory = pdfDocumentFactory; } diff --git a/app/core/src/main/resources/settings.yml.template b/app/core/src/main/resources/settings.yml.template index 96701af3b..a26f256f7 100644 --- a/app/core/src/main/resources/settings.yml.template +++ b/app/core/src/main/resources/settings.yml.template @@ -119,15 +119,15 @@ system: name: postgres # set the name of your database. Should match the name of the database you create customPaths: pipeline: - watchedFoldersDir: '' #Defaults to /pipeline/watchedFolders - finishedFoldersDir: '' #Defaults to /pipeline/finishedFolders + watchedFoldersDir: '' # Defaults to /pipeline/watchedFolders + finishedFoldersDir: '' # Defaults to /pipeline/finishedFolders operations: - weasyprint: '' #Defaults to /opt/venv/bin/weasyprint - unoconvert: '' #Defaults to /opt/venv/bin/unoconvert + weasyprint: '' # Defaults to /opt/venv/bin/weasyprint + unoconvert: '' # Defaults to /opt/venv/bin/unoconvert fileUploadLimit: '' # Defaults to "". No limit when string is empty. Set a number, between 0 and 999, followed by one of the following strings to set a limit. "KB", "MB", "GB". tempFileManagement: baseTmpDir: '' # Defaults to java.io.tmpdir/stirling-pdf - libreofficeDir: '' # Defaults to tempFileManagement.baseTmpDir/libreoffice + libreofficeDir: '' # Defaults to tempFileManagement.baseTmpDir/libreoffice systemTempDir: '' # Only used if cleanupSystemTemp is true prefix: stirling-pdf- # Prefix for temp file names maxAgeHours: 24 # Maximum age in hours before temp files are cleaned up diff --git a/proprietary/.gitignore b/app/proprietary/.gitignore similarity index 99% rename from proprietary/.gitignore rename to app/proprietary/.gitignore index 51fc2457f..13c974646 100644 --- a/proprietary/.gitignore +++ b/app/proprietary/.gitignore @@ -124,7 +124,7 @@ SwaggerDoc.json *.rar *.db /build -/proprietary/build/ +/app/proprietary/build/ # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/proprietary/LICENSE b/app/proprietary/LICENSE similarity index 100% rename from proprietary/LICENSE rename to app/proprietary/LICENSE diff --git a/proprietary/build.gradle b/app/proprietary/build.gradle similarity index 100% rename from proprietary/build.gradle rename to app/proprietary/build.gradle diff --git a/proprietary/src/main/java/stirling/software/proprietary/audit/AuditAspect.java b/app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditAspect.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/audit/AuditAspect.java rename to app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditAspect.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/audit/AuditEventType.java b/app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditEventType.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/audit/AuditEventType.java rename to app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditEventType.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/audit/AuditLevel.java b/app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditLevel.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/audit/AuditLevel.java rename to app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditLevel.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/audit/AuditUtils.java b/app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditUtils.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/audit/AuditUtils.java rename to app/proprietary/src/main/java/stirling/software/proprietary/audit/AuditUtils.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/audit/Audited.java b/app/proprietary/src/main/java/stirling/software/proprietary/audit/Audited.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/audit/Audited.java rename to app/proprietary/src/main/java/stirling/software/proprietary/audit/Audited.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/audit/ControllerAuditAspect.java b/app/proprietary/src/main/java/stirling/software/proprietary/audit/ControllerAuditAspect.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/audit/ControllerAuditAspect.java rename to app/proprietary/src/main/java/stirling/software/proprietary/audit/ControllerAuditAspect.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/config/AsyncConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/config/AsyncConfig.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/config/AsyncConfig.java rename to app/proprietary/src/main/java/stirling/software/proprietary/config/AsyncConfig.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/config/AuditConfigurationProperties.java b/app/proprietary/src/main/java/stirling/software/proprietary/config/AuditConfigurationProperties.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/config/AuditConfigurationProperties.java rename to app/proprietary/src/main/java/stirling/software/proprietary/config/AuditConfigurationProperties.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/config/AuditJpaConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/config/AuditJpaConfig.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/config/AuditJpaConfig.java rename to app/proprietary/src/main/java/stirling/software/proprietary/config/AuditJpaConfig.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/config/CustomAuditEventRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/config/CustomAuditEventRepository.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/config/CustomAuditEventRepository.java rename to app/proprietary/src/main/java/stirling/software/proprietary/config/CustomAuditEventRepository.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/controller/AdminJobController.java b/app/proprietary/src/main/java/stirling/software/proprietary/controller/AdminJobController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/controller/AdminJobController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/controller/AdminJobController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/controller/AuditDashboardController.java b/app/proprietary/src/main/java/stirling/software/proprietary/controller/AuditDashboardController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/controller/AuditDashboardController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/controller/AuditDashboardController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/model/Team.java b/app/proprietary/src/main/java/stirling/software/proprietary/model/Team.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/model/Team.java rename to app/proprietary/src/main/java/stirling/software/proprietary/model/Team.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java b/app/proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java rename to app/proprietary/src/main/java/stirling/software/proprietary/model/dto/TeamWithUserCountDTO.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/model/security/PersistentAuditEvent.java b/app/proprietary/src/main/java/stirling/software/proprietary/model/security/PersistentAuditEvent.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/model/security/PersistentAuditEvent.java rename to app/proprietary/src/main/java/stirling/software/proprietary/model/security/PersistentAuditEvent.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java rename to app/proprietary/src/main/java/stirling/software/proprietary/repository/PersistentAuditEventRepository.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationFailureHandler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/CustomAuthenticationSuccessHandler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/CustomLogoutSuccessHandler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/InitialSecuritySetup.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/RateLimitResetScheduler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpoint.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpoint.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpoint.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpoint.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpointAspect.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpointAspect.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpointAspect.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/config/EnterpriseEndpointAspect.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpoint.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/config/PremiumEndpointAspect.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/DatabaseConfig.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/MailConfig.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/SecurityConfiguration.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/EEAppConfig.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/KeygenLicenseVerifier.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyChecker.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/DatabaseController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/EmailController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/TeamController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/controller/api/UserController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/DatabaseWebController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/controller/web/TeamWebController.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/H2SQLCondition.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/H2SQLCondition.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/database/H2SQLCondition.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/database/H2SQLCondition.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/database/ScheduledTasks.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/AuthorityRepository.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/JPATokenRepositoryImpl.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/PersistentLoginRepository.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/SessionRepository.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/filter/EnterpriseEndpointFilter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/filter/FirstLoginFilter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/filter/IPRateLimitingFilter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserAuthenticationFilter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/filter/UserBasedRateLimitingFilter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/ApiKeyAuthenticationToken.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/AttemptCounter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/AttemptCounter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/AttemptCounter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/AttemptCounter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/AuthenticationType.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/Authority.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/PersistentLogin.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/SessionEntity.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/User.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/User.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/Email.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserDetails.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UpdateUserUsername.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/Username.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/api/user/UsernameAndPass.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/BackupNotFoundException.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/BackupNotFoundException.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/exception/BackupNotFoundException.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/BackupNotFoundException.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/NoProviderFoundException.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/NoProviderFoundException.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/model/exception/NoProviderFoundException.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/model/exception/NoProviderFoundException.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationFailureHandler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/CustomOAuth2AuthenticationSuccessHandler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/oauth2/OAuth2Configuration.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/repository/TeamRepository.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CertificateUtils.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticatedPrincipal.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationFailureHandler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2AuthenticationSuccessHandler.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/CustomSaml2ResponseAuthenticationConverter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/saml2/SAML2Configuration.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/AppUpdateAuthService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomOAuth2UserService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/CustomUserDetailsService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/DatabaseServiceInterface.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/EmailService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/LoginAttemptService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/TeamService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/service/UserService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/session/CustomHttpSessionListener.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionPersistentRegistry.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionRegistryConfig.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java rename to app/proprietary/src/main/java/stirling/software/proprietary/security/session/SessionScheduled.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/service/AuditCleanupService.java b/app/proprietary/src/main/java/stirling/software/proprietary/service/AuditCleanupService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/service/AuditCleanupService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/service/AuditCleanupService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/service/AuditService.java b/app/proprietary/src/main/java/stirling/software/proprietary/service/AuditService.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/service/AuditService.java rename to app/proprietary/src/main/java/stirling/software/proprietary/service/AuditService.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/util/SecretMasker.java b/app/proprietary/src/main/java/stirling/software/proprietary/util/SecretMasker.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/util/SecretMasker.java rename to app/proprietary/src/main/java/stirling/software/proprietary/util/SecretMasker.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/web/AuditWebFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/web/AuditWebFilter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/web/AuditWebFilter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/web/AuditWebFilter.java diff --git a/proprietary/src/main/java/stirling/software/proprietary/web/CorrelationIdFilter.java b/app/proprietary/src/main/java/stirling/software/proprietary/web/CorrelationIdFilter.java similarity index 100% rename from proprietary/src/main/java/stirling/software/proprietary/web/CorrelationIdFilter.java rename to app/proprietary/src/main/java/stirling/software/proprietary/web/CorrelationIdFilter.java diff --git a/proprietary/src/main/resources/application-proprietary.properties b/app/proprietary/src/main/resources/application-proprietary.properties similarity index 100% rename from proprietary/src/main/resources/application-proprietary.properties rename to app/proprietary/src/main/resources/application-proprietary.properties diff --git a/proprietary/src/main/resources/static/css/audit-dashboard.css b/app/proprietary/src/main/resources/static/css/audit-dashboard.css similarity index 100% rename from proprietary/src/main/resources/static/css/audit-dashboard.css rename to app/proprietary/src/main/resources/static/css/audit-dashboard.css diff --git a/proprietary/src/main/resources/static/css/modern-tables.css b/app/proprietary/src/main/resources/static/css/modern-tables.css similarity index 100% rename from proprietary/src/main/resources/static/css/modern-tables.css rename to app/proprietary/src/main/resources/static/css/modern-tables.css diff --git a/proprietary/src/main/resources/static/js/audit/dashboard.js b/app/proprietary/src/main/resources/static/js/audit/dashboard.js similarity index 100% rename from proprietary/src/main/resources/static/js/audit/dashboard.js rename to app/proprietary/src/main/resources/static/js/audit/dashboard.js diff --git a/proprietary/src/main/resources/templates/AUDIT_HELP.md b/app/proprietary/src/main/resources/templates/AUDIT_HELP.md similarity index 100% rename from proprietary/src/main/resources/templates/AUDIT_HELP.md rename to app/proprietary/src/main/resources/templates/AUDIT_HELP.md diff --git a/proprietary/src/main/resources/templates/AUDIT_USAGE.md b/app/proprietary/src/main/resources/templates/AUDIT_USAGE.md similarity index 100% rename from proprietary/src/main/resources/templates/AUDIT_USAGE.md rename to app/proprietary/src/main/resources/templates/AUDIT_USAGE.md diff --git a/proprietary/src/main/resources/templates/accounts/team-details.html b/app/proprietary/src/main/resources/templates/accounts/team-details.html similarity index 100% rename from proprietary/src/main/resources/templates/accounts/team-details.html rename to app/proprietary/src/main/resources/templates/accounts/team-details.html diff --git a/proprietary/src/main/resources/templates/accounts/teams.html b/app/proprietary/src/main/resources/templates/accounts/teams.html similarity index 100% rename from proprietary/src/main/resources/templates/accounts/teams.html rename to app/proprietary/src/main/resources/templates/accounts/teams.html diff --git a/proprietary/src/main/resources/templates/audit/dashboard.html b/app/proprietary/src/main/resources/templates/audit/dashboard.html similarity index 100% rename from proprietary/src/main/resources/templates/audit/dashboard.html rename to app/proprietary/src/main/resources/templates/audit/dashboard.html diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/CustomLogoutSuccessHandlerTest.java diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/configuration/DatabaseConfigTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/configuration/DatabaseConfigTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/configuration/DatabaseConfigTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/configuration/DatabaseConfigTest.java diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyCheckerTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyCheckerTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyCheckerTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/configuration/ee/LicenseKeyCheckerTest.java diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/controller/api/EmailControllerTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/controller/api/EmailControllerTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/controller/api/EmailControllerTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/controller/api/EmailControllerTest.java diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/service/EmailServiceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/EmailServiceTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/service/EmailServiceTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/service/EmailServiceTest.java diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/service/MailConfigTest.java diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/service/TeamServiceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/TeamServiceTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/service/TeamServiceTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/service/TeamServiceTest.java diff --git a/proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java b/app/proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java similarity index 100% rename from proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java rename to app/proprietary/src/test/java/stirling/software/proprietary/security/service/UserServiceTest.java diff --git a/build.gradle b/build.gradle index 4359f7236..831a9d794 100644 --- a/build.gradle +++ b/build.gradle @@ -66,7 +66,7 @@ allprojects { } tasks.register('writeVersion') { - def propsFile = file("$projectDir/common/src/main/resources/version.properties") + def propsFile = file("$projectDir/app/common/src/main/resources/version.properties") def propsDir = propsFile.parentFile doLast { diff --git a/settings.gradle b/settings.gradle index 1545f6f35..8af0ad4d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,5 +11,5 @@ include 'stirling-pdf', 'common', 'proprietary' // To let Gradle know where the ':stirling-pdf' module actually resides and to avoid case conflicts, // we explicitly map the alias to the folder: project(':stirling-pdf').projectDir = file('app/core') -project(':common' ).projectDir = file('common') -project(':proprietary' ).projectDir = file('proprietary') +project(':common' ).projectDir = file('app/common') +project(':proprietary' ).projectDir = file('app/proprietary')