diff options
Diffstat (limited to 'jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java')
| -rw-r--r-- | jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java index 9ffb07bd14..f3a7b4b99d 100644 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/BaseHome.java @@ -130,7 +130,6 @@ public class BaseHome public BaseHome(CommandLineConfigSource cmdLineSource) throws IOException { - sources = new ConfigSources(); sources.add(cmdLineSource); this.homeDir = cmdLineSource.getHomePath(); @@ -201,7 +200,7 @@ public class BaseHome */ public Path getBasePath(String path) { - return baseDir.resolve(path); + return baseDir.resolve(path).normalize().toAbsolutePath(); } public ConfigSources getConfigSources() @@ -324,20 +323,19 @@ public class BaseHome * <dt><code>lib/**/*-dev.jar</code></dt> * <dd>Relative pattern, recursive search <code>${jetty.home}</code> then <code>${jetty.base}</code> for files under <code>lib</code> ending in * <code>-dev.jar</code></dd> - * </dl> * * <dt><code>etc/jetty.xml</code></dt> * <dd>Relative pattern, no glob, search for <code>${jetty.home}/etc/jetty.xml</code> then <code>${jetty.base}/etc/jetty.xml</code></dd> * * <dt><code>glob:/opt/app/common/*-corp.jar</code></dt> - * <dd>PathMapper pattern, glob, search <code>/opt/app/common/</code> for <code>*-corp.jar</code></code></dd> + * <dd>PathMapper pattern, glob, search <code>/opt/app/common/</code> for <code>*-corp.jar</code></dd> * * </dl> * * <p> * Notes: * <ul> - * <li>FileSystem case sensitivity is implementation specific (eg: linux is case-sensitive, windows is case-insensitive).<br/> + * <li>FileSystem case sensitivity is implementation specific (eg: linux is case-sensitive, windows is case-insensitive).<br> * See {@link java.nio.file.FileSystem#getPathMatcher(String)} for more details</li> * <li>Pattern slashes are implementation neutral (use '/' always and you'll be fine)</li> * <li>Recursive searching is limited to 30 levels deep (not configurable)</li> @@ -415,6 +413,8 @@ public class BaseHome /** * Convenience method for <code>toShortForm(file.toPath())</code> + * @param path the path to shorten + * @return the short form of the path as a String */ public String toShortForm(final File path) { |