Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2012-08-10 13:51:27 +0000
committerSimone Bordet2012-08-10 17:02:16 +0000
commit136f7924fdcd20d7410837337f1044ba270bf8be (patch)
tree120a8e744a2c0aebb55e77c59321e3718defed33 /jetty-deploy/src/test
parent4d74adc1e576041dfee6816f93c47c5e41a99078 (diff)
downloadorg.eclipse.jetty.project-136f7924fdcd20d7410837337f1044ba270bf8be.tar.gz
org.eclipse.jetty.project-136f7924fdcd20d7410837337f1044ba270bf8be.tar.xz
org.eclipse.jetty.project-136f7924fdcd20d7410837337f1044ba270bf8be.zip
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
Diffstat (limited to 'jetty-deploy/src/test')
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java3
-rw-r--r--jetty-deploy/src/test/resources/jetty.xml2
2 files changed, 2 insertions, 3 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
index 9b8abcc23d..3c46cb02d5 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
@@ -378,8 +378,7 @@ public class XmlConfiguredJetty
Assert.assertEquals("Server load count",1,serverCount);
this._server = foundServer;
- this._server.setGracefulShutdown(10);
-
+ this._server.setStopTimeout(10);
}
public void removeContext(String name)
diff --git a/jetty-deploy/src/test/resources/jetty.xml b/jetty-deploy/src/test/resources/jetty.xml
index 4c1734b87f..785ca81320 100644
--- a/jetty-deploy/src/test/resources/jetty.xml
+++ b/jetty-deploy/src/test/resources/jetty.xml
@@ -123,6 +123,6 @@
<Set name="stopAtShutdown">true</Set>
<Set name="sendServerVersion">true</Set>
<Set name="sendDateHeader">true</Set>
- <Set name="gracefulShutdown">1000</Set>
+ <Set name="stopTimeout">1000</Set>
</Configure>

Back to the top