Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2010-10-23 03:02:17 -0400
committerGreg Wilkins2010-10-23 03:02:17 -0400
commit5cdb4bb81994364d32438b2ce54bb2c7268df31b (patch)
tree5c9664ce21c86c20d4602c8fbce439fa365219ad
parent72e6f5ee407fc373ea6cf27c1e3e99758606bcf2 (diff)
downloadorg.eclipse.jetty.project-5cdb4bb81994364d32438b2ce54bb2c7268df31b.tar.gz
org.eclipse.jetty.project-5cdb4bb81994364d32438b2ce54bb2c7268df31b.tar.xz
org.eclipse.jetty.project-5cdb4bb81994364d32438b2ce54bb2c7268df31b.zip
328523 Fixed overloaded setters in AppProvider
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2389 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java34
2 files changed, 31 insertions, 4 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 5879d444b6..ca95bcc04a 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -3,6 +3,7 @@
+ 328205 Improved SelectManager stopping
+ 328306 Serialization of FormAuthentication
+ 328332 Response.getContentType works with setHeader
+ + 328523 Fixed overloaded setters in AppProvider
jetty-7.2.0.v20101020 20 October 2010
+ 289540 added javadoc into distribution
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 37f7c6f6b8..09cce7cf14 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
@@ -176,12 +176,25 @@ public abstract class ScanningAppProvider extends AbstractLifeCycle implements A
}
/* ------------------------------------------------------------ */
+ @Deprecated
public Resource getMonitoredDir()
{
return _monitoredDir;
}
/* ------------------------------------------------------------ */
+ public Resource getMonitoredDirResource()
+ {
+ return _monitoredDir;
+ }
+
+ /* ------------------------------------------------------------ */
+ public String getMonitoredDirName()
+ {
+ return _monitoredDir.toString();
+ }
+
+ /* ------------------------------------------------------------ */
public int getScanInterval()
{
return _scanInterval;
@@ -200,22 +213,35 @@ public abstract class ScanningAppProvider extends AbstractLifeCycle implements A
}
/* ------------------------------------------------------------ */
+ @Deprecated
+ public void setMonitoredDir(Resource dir)
+ {
+ setMonitoredDirResource(dir);
+ }
- public void setMonitoredDir(Resource contextsDir)
+ /* ------------------------------------------------------------ */
+ @Deprecated
+ public void setMonitoredDir(String dir)
+ {
+ setMonitoredDirName(dir);
+ }
+
+ /* ------------------------------------------------------------ */
+ public void setMonitoredDirResource(Resource contextsDir)
{
_monitoredDir = contextsDir;
}
-
+
/* ------------------------------------------------------------ */
/**
* @param dir
* Directory to scan for context descriptors or war files
*/
- public void setMonitoredDir(String dir)
+ public void setMonitoredDirName(String dir)
{
try
{
- _monitoredDir = Resource.newResource(dir);
+ setMonitoredDirResource(Resource.newResource(dir));
}
catch (Exception e)
{

Back to the top