From edbc9845f41f5fa68b9305a4df199502cda75ce2 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Wed, 22 Oct 2025 15:42:55 -0700 Subject: [PATCH] fix: rename with small doc --- .../Dockerfile | 4 ++-- download-manager/README.md | 18 ++++++++++++++++++ {downloadManager => download-manager}/VERSION | 0 .../build.gradle | 0 .../integration/DownloadManagerIntTest.java | 0 .../java/ca/nrc/cadc/dlm/server/SkinUtil.java | 0 .../downloadManagerBundle_en.properties | 0 .../downloadManagerBundle_fr.properties | 0 .../src/main/resources/cadcDownload | 0 .../src/main/webapp/WEB-INF/c.tld | 0 .../src/main/webapp/WEB-INF/fmt.tld | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../test/src/resources/TestPage.html | 0 downloadManager/README | 14 -------------- settings.gradle | 2 +- 15 files changed, 21 insertions(+), 17 deletions(-) rename {downloadManager => download-manager}/Dockerfile (67%) create mode 100644 download-manager/README.md rename {downloadManager => download-manager}/VERSION (100%) rename {downloadManager => download-manager}/build.gradle (100%) rename {downloadManager => download-manager}/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java (100%) rename {downloadManager => download-manager}/src/main/java/ca/nrc/cadc/dlm/server/SkinUtil.java (100%) rename {downloadManager => download-manager}/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_en.properties (100%) rename {downloadManager => download-manager}/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_fr.properties (100%) rename {downloadManager => download-manager}/src/main/resources/cadcDownload (100%) rename {downloadManager => download-manager}/src/main/webapp/WEB-INF/c.tld (100%) rename {downloadManager => download-manager}/src/main/webapp/WEB-INF/fmt.tld (100%) rename {downloadManager => download-manager}/src/main/webapp/WEB-INF/web.xml (100%) rename {downloadManager => download-manager}/test/src/resources/TestPage.html (100%) delete mode 100644 downloadManager/README diff --git a/downloadManager/Dockerfile b/download-manager/Dockerfile similarity index 67% rename from downloadManager/Dockerfile rename to download-manager/Dockerfile index 6d2a583..b016a1b 100644 --- a/downloadManager/Dockerfile +++ b/download-manager/Dockerfile @@ -1,9 +1,9 @@ -FROM images.opencadc.org/library/cadc-tomcat:1.4 +FROM images.opencadc.org/library/cadc-tomcat:1 # Clear out the webapps directory. RUN rm -rf webapps/* -# Allow JAR scanning +# Allow JAR scanning due allow serving JSPs from classpath RUN sed -i '/^tomcat.util.scan.StandardJarScanFilter.jarsToSkip/d' /usr/share/tomcat/conf/catalina.properties COPY build/libs/*.war /usr/share/tomcat/webapps/ diff --git a/download-manager/README.md b/download-manager/README.md new file mode 100644 index 0000000..01c6077 --- /dev/null +++ b/download-manager/README.md @@ -0,0 +1,18 @@ +# Download Manager + +## Running it + +For backwards compatibility with existing scripts, the download manager app should be run with a [WAR rename configuration](https://github.com/opencadc/docker-base/tree/main/cadc-tomcat#war-renameconf): + +`war-rename.conf`: +```txt +mv download-manager.war downloadManager.war +``` + +## Testing it + +Running integration tests requires: +- valid test certificates (in $A/test-certificates) +- valid servops.pem +- valid ca.crt file + diff --git a/downloadManager/VERSION b/download-manager/VERSION similarity index 100% rename from downloadManager/VERSION rename to download-manager/VERSION diff --git a/downloadManager/build.gradle b/download-manager/build.gradle similarity index 100% rename from downloadManager/build.gradle rename to download-manager/build.gradle diff --git a/downloadManager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java b/download-manager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java similarity index 100% rename from downloadManager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java rename to download-manager/src/intTest/java/ca/nrc/cadc/downloadManager/integration/DownloadManagerIntTest.java diff --git a/downloadManager/src/main/java/ca/nrc/cadc/dlm/server/SkinUtil.java b/download-manager/src/main/java/ca/nrc/cadc/dlm/server/SkinUtil.java similarity index 100% rename from downloadManager/src/main/java/ca/nrc/cadc/dlm/server/SkinUtil.java rename to download-manager/src/main/java/ca/nrc/cadc/dlm/server/SkinUtil.java diff --git a/downloadManager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_en.properties b/download-manager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_en.properties similarity index 100% rename from downloadManager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_en.properties rename to download-manager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_en.properties diff --git a/downloadManager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_fr.properties b/download-manager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_fr.properties similarity index 100% rename from downloadManager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_fr.properties rename to download-manager/src/main/resources/ca/nrc/cadc/downloadManager/downloadManagerBundle_fr.properties diff --git a/downloadManager/src/main/resources/cadcDownload b/download-manager/src/main/resources/cadcDownload similarity index 100% rename from downloadManager/src/main/resources/cadcDownload rename to download-manager/src/main/resources/cadcDownload diff --git a/downloadManager/src/main/webapp/WEB-INF/c.tld b/download-manager/src/main/webapp/WEB-INF/c.tld similarity index 100% rename from downloadManager/src/main/webapp/WEB-INF/c.tld rename to download-manager/src/main/webapp/WEB-INF/c.tld diff --git a/downloadManager/src/main/webapp/WEB-INF/fmt.tld b/download-manager/src/main/webapp/WEB-INF/fmt.tld similarity index 100% rename from downloadManager/src/main/webapp/WEB-INF/fmt.tld rename to download-manager/src/main/webapp/WEB-INF/fmt.tld diff --git a/downloadManager/src/main/webapp/WEB-INF/web.xml b/download-manager/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from downloadManager/src/main/webapp/WEB-INF/web.xml rename to download-manager/src/main/webapp/WEB-INF/web.xml diff --git a/downloadManager/test/src/resources/TestPage.html b/download-manager/test/src/resources/TestPage.html similarity index 100% rename from downloadManager/test/src/resources/TestPage.html rename to download-manager/test/src/resources/TestPage.html diff --git a/downloadManager/README b/downloadManager/README deleted file mode 100644 index 6552be6..0000000 --- a/downloadManager/README +++ /dev/null @@ -1,14 +0,0 @@ - -known issues: - -"gradle clean build" fails because something done in the configuration phase gets wiped by the clean - -build always unzips and signs the jnlp jar files - -work around: do the clean and build as separate commands - -Running integration tests requires: -- valid test certificates (in $A/test-certificates) -- valid servops.pem -- valid ca.crt file - diff --git a/settings.gradle b/settings.gradle index a645db8..8c47b2e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'apps' -include('cadc-download-manager', 'cadc-download-manager-server', 'downloadManager') +include('cadc-download-manager', 'cadc-download-manager-server', 'download-manager')