Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2012-01-11 00:35:57 -0500
committerJan Bartel2012-01-11 00:35:57 -0500
commit691efcc7caa82bf68d4afc66942a7360c7469fdc (patch)
tree61201fe8035479749a56f9a7b09acd3d9f49f923 /jetty-deploy/src
parent70961bc53b2a40b11e79e595d79ffd52e53478d4 (diff)
parent1697fcfa5a58d57dab0704b32b5a253c93af9af4 (diff)
downloadorg.eclipse.jetty.project-691efcc7caa82bf68d4afc66942a7360c7469fdc.tar.gz
org.eclipse.jetty.project-691efcc7caa82bf68d4afc66942a7360c7469fdc.tar.xz
org.eclipse.jetty.project-691efcc7caa82bf68d4afc66942a7360c7469fdc.zip
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-deploy/src')
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/DeploymentManager.java6
1 files changed, 6 insertions, 0 deletions
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 fb8e1a5d36..afe06a80e1 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
@@ -139,6 +139,12 @@ public class DeploymentManager extends AggregateLifeCycle
}
}
+ /* ------------------------------------------------------------ */
+ /** Set the AppProviders.
+ * The providers passed are added via {@link #addBean(Object)} so that
+ * their lifecycles may be managed as a {@link AggregateLifeCycle}.
+ * @param providers
+ */
public void setAppProviders(Collection<AppProvider> providers)
{
if (isRunning())

Back to the top