Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2012-07-24 08:38:28 +0000
committerSimone Bordet2012-07-24 08:38:28 +0000
commit822abe514e55c7795cc4721d86c4d8d059e9b218 (patch)
treed3188aeb528ea235e28f8990691c0e46b4c06b95 /jetty-deploy/src/test
parent88f49877218766ee3b45cb5240c12285463be363 (diff)
downloadorg.eclipse.jetty.project-822abe514e55c7795cc4721d86c4d8d059e9b218.tar.gz
org.eclipse.jetty.project-822abe514e55c7795cc4721d86c4d8d059e9b218.tar.xz
org.eclipse.jetty.project-822abe514e55c7795cc4721d86c4d8d059e9b218.zip
Jetty9 - Improved idle timeout handling.
Idle timeouts are not enforced anymore by polling the AsyncEndPoints from the SelectorManager, but instead the AsyncEndPoints now take a SchedulerExecutorService as parameter and perform their own enforcing of the idle timeout. Also removed a few Timer usages (replaced by SchedulerExecutorService) and fixed XML files referencing old APIs.
Diffstat (limited to 'jetty-deploy/src/test')
-rw-r--r--jetty-deploy/src/test/resources/binding-test-contexts-1.xml8
-rw-r--r--jetty-deploy/src/test/resources/jetty-deploy-wars.xml4
2 files changed, 6 insertions, 6 deletions
diff --git a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
index 65e13ab5cf..38979a28ab 100644
--- a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
+++ b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
@@ -25,13 +25,13 @@
<Item>org.eclipse.jetty.servlet.DefaultServlet</Item>
</Array>
- <Call name="addLifeCycle">
+ <Call name="addBean">
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
<Ref id="Contexts" />
- </Set>
-
+ </Set>
+
<Ref id="DeploymentManager">
<Call name="addLifeCycleBinding">
<Arg>
@@ -41,7 +41,7 @@
</Arg>
</Call>
</Ref>
-
+
<!-- Providers of Apps -->
<Set name="appProviders">
<Array type="org.eclipse.jetty.deploy.AppProvider">
diff --git a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml
index 6ab95b65d5..859887b555 100644
--- a/jetty-deploy/src/test/resources/jetty-deploy-wars.xml
+++ b/jetty-deploy/src/test/resources/jetty-deploy-wars.xml
@@ -3,13 +3,13 @@
<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <Call name="addLifeCycle">
+ <Call name="addBean">
<Arg>
<New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
<Set name="contexts">
<Ref id="Contexts" />
</Set>
-
+
<!-- Providers of Apps -->
<Set name="appProviders">
<Array type="org.eclipse.jetty.deploy.AppProvider">

Back to the top