[jetty-commit] r2389 - in jetty/trunk: . jetty-deploy/src/main/java/org/

[genie@xxxxxxxxxxx]

Author: gwilkins
Date: 2010-10-23 03:02:17 -0400 (Sat, 23 Oct 2010)
New Revision: 2389

Modified:
   jetty/trunk/VERSION.txt
   jetty/trunk/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java
Log:
328523 Fixed overloaded setters in AppProvider

Modified: jetty/trunk/VERSION.txt
===================================================================
--- jetty/trunk/VERSION.txt	2010-10-22 23:12:22 UTC (rev 2388)
+++ jetty/trunk/VERSION.txt	2010-10-23 07:02:17 UTC (rev 2389)
@@ -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

Modified: jetty/trunk/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java
===================================================================
--- jetty/trunk/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java	2010-10-22 23:12:22 UTC (rev 2388)
+++ jetty/trunk/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ScanningAppProvider.java	2010-10-23 07:02:17 UTC (rev 2389)
@@ -176,12 +176,25 @@
     }
 
     /* ------------------------------------------------------------ */
+    @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 @@
     }
 
     /* ------------------------------------------------------------ */
+    @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)
         {