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 35485ad7c61..70ca6bebd56 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 @@ -183,34 +183,18 @@ public class BaseHome return baseDir.toString(); } - /** - * @deprecated use {@link #getBasePath()} - */ - @Deprecated - public File getBaseDir() - { - return baseDir.toFile(); - } - - /** - * Create a file reference to some content in "${jetty.base}" - * - * @param path - * the path to reference - * @return the file reference - * @deprecated use {@link #getBasePath(String)} - */ - @Deprecated - public File getBaseFile(String path) - { - return baseDir.resolve(path).toFile(); - } - public Path getBasePath() { return baseDir; } + /** + * Create a {@link Path} reference to some content in "${jetty.base}" + * + * @param path + * the path to reference + * @return the file reference + */ public Path getBasePath(String path) { return baseDir.resolve(path); @@ -221,41 +205,11 @@ public class BaseHome return this.sources; } - /** - * Get a specific file reference. - *

- * File references go through 3 possibly scenarios. - *

    - *
  1. If exists relative to ${jetty.base}, return that reference
  2. - *
  3. If exists relative to ${jetty.home}, return that reference
  4. - *
  5. Otherwise return absolute path reference (standard java logic)
  6. - *
- * - * @param path - * the path to get. - * @return the file reference. - * @deprecated use {@link #getPath(String)} - */ - @Deprecated - public File getFile(String path) - { - return getPath(path).toAbsolutePath().toFile(); - } - public String getHome() { return homeDir.toString(); } - /** - * @deprecated use {@link #getHomePath()} - */ - @Deprecated - public File getHomeDir() - { - return homeDir.toFile(); - } - public Path getHomePath() { return homeDir;