opencadc · at88mph · Oct 22, 2025 · Oct 22, 2025
diff --git a/downloadManager/Dockerfile → download-manager/Dockerfile b/downloadManager/Dockerfile → 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
@@ -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 → download-manager/VERSION b/downloadManager/VERSION → download-manager/VERSION
diff --git a/downloadManager/build.gradle → download-manager/build.gradle b/downloadManager/build.gradle → download-manager/build.gradle
diff --git a/...r/integration/DownloadManagerIntTest.java → ...r/integration/DownloadManagerIntTest.java b/...r/integration/DownloadManagerIntTest.java → ...r/integration/DownloadManagerIntTest.java
diff --git a/...java/ca/nrc/cadc/dlm/server/SkinUtil.java → ...java/ca/nrc/cadc/dlm/server/SkinUtil.java b/...java/ca/nrc/cadc/dlm/server/SkinUtil.java → ...java/ca/nrc/cadc/dlm/server/SkinUtil.java
diff --git a/...nager/downloadManagerBundle_en.properties → ...nager/downloadManagerBundle_en.properties b/...nager/downloadManagerBundle_en.properties → ...nager/downloadManagerBundle_en.properties
diff --git a/...nager/downloadManagerBundle_fr.properties → ...nager/downloadManagerBundle_fr.properties b/...nager/downloadManagerBundle_fr.properties → ...nager/downloadManagerBundle_fr.properties
diff --git a/...adManager/src/main/resources/cadcDownload → ...d-manager/src/main/resources/cadcDownload b/...adManager/src/main/resources/cadcDownload → ...d-manager/src/main/resources/cadcDownload
diff --git a/...loadManager/src/main/webapp/WEB-INF/c.tld → ...oad-manager/src/main/webapp/WEB-INF/c.tld b/...loadManager/src/main/webapp/WEB-INF/c.tld → ...oad-manager/src/main/webapp/WEB-INF/c.tld
diff --git a/...adManager/src/main/webapp/WEB-INF/fmt.tld → ...d-manager/src/main/webapp/WEB-INF/fmt.tld b/...adManager/src/main/webapp/WEB-INF/fmt.tld → ...d-manager/src/main/webapp/WEB-INF/fmt.tld
diff --git a/...adManager/src/main/webapp/WEB-INF/web.xml → ...d-manager/src/main/webapp/WEB-INF/web.xml b/...adManager/src/main/webapp/WEB-INF/web.xml → ...d-manager/src/main/webapp/WEB-INF/web.xml
diff --git a/...dManager/test/src/resources/TestPage.html → ...-manager/test/src/resources/TestPage.html b/...dManager/test/src/resources/TestPage.html → ...-manager/test/src/resources/TestPage.html
diff --git a/downloadManager/README b/downloadManager/README
diff --git 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')