diff --git a/commons/src/main/java/org/archive/spring/ConfigPathConfigurer.java b/commons/src/main/java/org/archive/spring/ConfigPathConfigurer.java index 06239256..12b03d10 100644 --- a/commons/src/main/java/org/archive/spring/ConfigPathConfigurer.java +++ b/commons/src/main/java/org/archive/spring/ConfigPathConfigurer.java @@ -69,10 +69,11 @@ public class ConfigPathConfigurer if(cp.getBase()==null) { cp.setBase(path); } + String propPath = beanName+"."+d.getName(); if(StringUtils.isEmpty(cp.getName())) { - cp.setName(beanName+"."+d.getName()); + cp.setName(propPath); } - remember(cp); + remember(propPath, cp); } } } @@ -118,8 +119,8 @@ public class ConfigPathConfigurer // REMEMBERED PATHS Map paths = new HashMap(); - protected void remember(ConfigPath cp) { - paths.put(cp.getName(), cp); + protected void remember(String key, ConfigPath cp) { + paths.put(key, cp); } public Map getPaths() { return paths; diff --git a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java index 2b29dfef..0751d7ec 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java +++ b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java @@ -297,8 +297,9 @@ public class JobResource extends Resource { pw.println("build the job to discover referenced paths"); } else { pw.println("
"); - for(ConfigPath cp : cj.getConfigPaths().values()) { - pw.println("
"+cp.getName()+"
"); + for(String cppp : cj.getConfigPaths().keySet()) { + ConfigPath cp = cj.getConfigPaths().get(cppp); + pw.println("
"+cppp+": "+cp.getName()+"
"); pw.println("
"); printLinked(pw, cp.getFile()); pw.println("
"); diff --git a/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java b/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java index df7dd519..960e18bc 100644 --- a/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java +++ b/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java @@ -203,7 +203,7 @@ implements Lifecycle { this.serverCache = serverCache; } - protected ConfigPath directory = new ConfigPath("writer sbudirectory", "."); + protected ConfigPath directory = new ConfigPath("writer subdirectory", "."); public ConfigPath getDirectory() { return directory; }