From 8ad12fa758de0398387c3cedb4aef037ad654e23 Mon Sep 17 00:00:00 2001 From: Toke Eskildsen Date: Thu, 10 Aug 2023 11:17:07 +0200 Subject: [PATCH] Correct JavaDoc with info on catalina environment variables --- .../java/dk/kb/netarchivesuite/solrwayback/util/FileUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dk/kb/netarchivesuite/solrwayback/util/FileUtil.java b/src/main/java/dk/kb/netarchivesuite/solrwayback/util/FileUtil.java index 3154b42d..67c55a72 100644 --- a/src/main/java/dk/kb/netarchivesuite/solrwayback/util/FileUtil.java +++ b/src/main/java/dk/kb/netarchivesuite/solrwayback/util/FileUtil.java @@ -75,7 +75,7 @@ public static Path resolve(String resource) throws IOException { *
  • As {@code env:user.dir/resource}, {@code env:user.dir/../resource} etc
    • *
  • As {@code env:user.home/resource}
    • * - * When running under Tomcat, {@code catalina.home} is guaranteed to be set and {@code catalina.home} might be set. + * When running under Tomcat, {@code catalina.home} is guaranteed to be set and {@code catalina.base} might be set. * @param resources one or more resources to look for. First file system match is returned. * @return a Path to an existing file, found using the priorities stated above. * @throws FileNotFoundException if none of the resources could be found. @@ -103,7 +103,7 @@ public static Path resolveContainerResource(String... resources) throws FileNotF *
  • As {@code env:user.dir/resource}, {@code env:user.dir/../resource} etc
    • *
  • As {@code env:user.home/resource}
    • * - * When running under Tomcat, {@code catalina.home} is guaranteed to be set and {@code catalina.home} might be set. + * When running under Tomcat, {@code catalina.home} is guaranteed to be set and {@code catalina.base} might be set. * @param resource a resource to look for. * @return a stream with Paths to check for existence of the given resource, in order of priority as listed above. */