diff --git a/VERSION.txt b/VERSION.txt index 9a987504297..eca3e53dd97 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -13,6 +13,7 @@ jetty-7.4.1-SNAPSHOT + 344067 Add support for OSGi fragment bundles to add static resources to web-bundles + 344513 Attempting to set ConfigurationClasses in jetty-web.xml causes NPE + 344529 Ability to customize the error handling of the OSGi HttpService + + 345047 Readded deprecated ScanningAppDeployer#setMonitoredDir + JETTY-954 WebAppContext eats any start exceptions instead of stopping the server load + JETTY-1314 Handle bad URI encodings + JETTY-1324 Tested not using CESU-8 instead of UTF-8 diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java index e4d2e71832c..dc1dab6f23d 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java @@ -217,6 +217,15 @@ public abstract class ScanningAppProvider extends AbstractLifeCycle implements A { _scanner.addListener(listener); } + + /* ------------------------------------------------------------ */ + /** + * @deprecated Use {@link #setMonitoredDirName(String)} + */ + public void setMonitoredDir(String dir) + { + setMonitoredDirName(dir); + } /* ------------------------------------------------------------ */ /**