Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2011-01-21 15:49:28 -0500
committerJoakim Erdfelt2011-01-21 15:49:28 -0500
commitf3a2a575aa8cbab73c4bdad4ac7fc30a20d52607 (patch)
tree29b562999f3183032725041f0640ac88fb12a14f /jetty-deploy/src/main
parent075f5f12c05a10e2393fda323a5b12582de04737 (diff)
downloadorg.eclipse.jetty.project-f3a2a575aa8cbab73c4bdad4ac7fc30a20d52607.tar.gz
org.eclipse.jetty.project-f3a2a575aa8cbab73c4bdad4ac7fc30a20d52607.tar.xz
org.eclipse.jetty.project-f3a2a575aa8cbab73c4bdad4ac7fc30a20d52607.zip
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
Diffstat (limited to 'jetty-deploy/src/main')
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java5
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java3
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java10
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/WebAppProvider.java8
4 files changed, 10 insertions, 16 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
{

Back to the top