Fixing broken javadoc and imports

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2673 7e9141cc-0065-0410-87d8-b60c137991c4

6 files changed, 12 insertions, 19 deletions

diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
index e510a9f55e..f979243d75 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
@@ -18,6 +18,8 @@ import java.io.FilenameFilter;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.eclipse.jetty.deploy.providers.ContextProvider;
+import org.eclipse.jetty.deploy.providers.ScanningAppProvider;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -63,10 +65,11 @@ import org.eclipse.jetty.xml.XmlConfiguration;
  * configurations to it simply by dropping different xml configuration files into the configuration directory.
  * 
  * @see DeploymentManager
- * @see MonitoredDirAppProvider
+ * @see ScanningAppProvider
  * 
  * @org.apache.xbean.XBean element="hotDeployer" description="Creates a hot deployer to watch a directory for changes at
  *                         a configurable interval."
+ * @deprecated replaced with {@link ContextProvider} from the {@link DeploymentManager}
  */
 @SuppressWarnings("unchecked")
 @Deprecated
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
index 5b8c56a830..9b597115cb 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
@@ -15,6 +15,7 @@ package org.eclipse.jetty.deploy;
 
 import java.util.ArrayList;
 
+import org.eclipse.jetty.deploy.providers.ScanningAppProvider;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.ContextHandlerCollection;
@@ -45,7 +46,7 @@ import org.eclipse.jetty.webapp.WebAppContext;
  * 
  * @deprecated
  * @see DeploymentManager
- * @see MonitoredDirAppProvider
+ * @see ScanningAppProvider
  * @see ContextDeployer
  */
 @SuppressWarnings("unchecked")
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
index ff53e248f5..1fc1bc390b 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
@@ -2,24 +2,18 @@ package org.eclipse.jetty.deploy.providers;
 
 import java.io.File;
 import java.io.FilenameFilter;
-import java.util.HashMap;
-import java.util.Map;
 
 import org.eclipse.jetty.deploy.App;
 import org.eclipse.jetty.deploy.ConfigurationManager;
-import org.eclipse.jetty.deploy.ContextDeployer;
 import org.eclipse.jetty.deploy.util.FileID;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.xml.XmlConfiguration;
 
-
-/* ------------------------------------------------------------ */
 /** Context directory App Provider.
- * <p>This specialization of {@link MonitoredDirAppProvider} is the
- * replacement for {@link ContextDeployer} and it will scan a directory
+ * <p>This specialization of {@link ScanningAppProvider} is the
+ * replacement for the old (and deprecated) <code>org.eclipse.jetty.deploy.ContextDeployer</code> and it will scan a directory
  * only for context.xml files.
- * @see ContextDeployer
  */
 public class ContextProvider extends ScanningAppProvider
 {
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
index 610f91926a..f2137a6699 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java
@@ -6,25 +6,21 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 
 import org.eclipse.jetty.deploy.App;
-import org.eclipse.jetty.deploy.WebAppDeployer;
 import org.eclipse.jetty.deploy.util.FileID;
 import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.eclipse.jetty.webapp.WebInfConfiguration;
-
 
 /* ------------------------------------------------------------ */
 /** Context directory App Provider.
- * <p>This specialization of {@link MonitoredDirAppProvider} is the
- * replacement for {@link WebAppDeployer} and it will scan a directory
+ * <p>This specialization of {@link ScanningAppProvider} is the
+ * replacement for old (and deprecated) <code>org.eclipse.jetty.deploy.WebAppDeployer</code> and it will scan a directory
  * only for war files or directories files.</p>
  * <p>
  * Webapps with names root or starting with root- are deployed at /.
  * If the name is in the format root-hostname, then the webapp is deployed
  * at / in the virtual host hostname.
- * @see WebAppDeployer
  */
 public class WebAppProvider extends ScanningAppProvider
 {
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderRuntimeUpdatesTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderRuntimeUpdatesTest.java
index 596b8be6e5..69608d766a 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderRuntimeUpdatesTest.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderRuntimeUpdatesTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 /**
  * Similar in scope to {@link MonitoredDirAppProviderStartupTest}, except is concerned with the modification of existing
- * deployed webapps due to incoming changes identified by the {@link MonitoredDirAppProvider}.
+ * deployed webapps due to incoming changes identified by the {@link ScanningAppProvider}.
  */
 public class MonitoredDirAppProviderRuntimeUpdatesTest
 {
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderStartupTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderStartupTest.java
index c5b98bfb41..9cafb0de8e 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderStartupTest.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProviderStartupTest.java
@@ -16,13 +16,12 @@
 package org.eclipse.jetty.deploy.providers;
 
 import org.eclipse.jetty.deploy.test.XmlConfiguredJetty;
-import org.eclipse.jetty.util.log.Log;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
- * Tests {@link MonitoredDirAppProvider} as it starts up for the first time.
+ * Tests {@link ScanningAppProvider} as it starts up for the first time.
  */
 public class MonitoredDirAppProviderStartupTest
 {