From caf4735792b0f3d45b6d52a5eef299f7dd6b5919 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 16 Dec 2009 21:46:02 +0000 Subject: [PATCH] Adding convenience methods git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1154 7e9141cc-0065-0410-87d8-b60c137991c4 --- .../eclipse/jetty/deploy/DeploymentManager.java | 16 ++++++++++++++++ .../providers/MonitoredDirAppProvider.java | 1 - 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java index 2bd8e903722..a52f1fb678f 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java @@ -28,6 +28,7 @@ import org.eclipse.jetty.deploy.bindings.StandardDeployer; import org.eclipse.jetty.deploy.bindings.StandardStarter; import org.eclipse.jetty.deploy.bindings.StandardStopper; import org.eclipse.jetty.deploy.bindings.StandardUndeployer; +import org.eclipse.jetty.deploy.graph.Edge; import org.eclipse.jetty.deploy.graph.Node; import org.eclipse.jetty.deploy.graph.Path; import org.eclipse.jetty.server.Server; @@ -149,6 +150,21 @@ public class DeploymentManager extends AbstractLifeCycle lifecycle.addBinding(binding); } + /** + * Convenience method to allow for insertion of nodes into the lifecycle. + * + * @param existingFromNodeName + * @param existingToNodeName + * @param insertedNodeName + */ + public void insertLifeCycleNode(String existingFromNodeName, String existingToNodeName, String insertedNodeName) + { + Node fromNode = lifecycle.getNodeByName(existingFromNodeName); + Node toNode = lifecycle.getNodeByName(existingToNodeName); + Edge edge = new Edge(fromNode,toNode); + lifecycle.insertNode(edge,insertedNodeName); + } + @Override protected void doStart() throws Exception { diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProvider.java index 1b006adc641..e7cb909dd16 100644 --- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProvider.java +++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/MonitoredDirAppProvider.java @@ -211,7 +211,6 @@ public class MonitoredDirAppProvider extends AbstractLifeCycle implements AppPro this.scanner.setRecursive(recursive); this.scanner.setFilenameFilter(filenamefilter); this.scanner.addListener(this); - this.scanner.scan(); this.scanner.start(); Log.info("Started scanner: " + scanner); }