Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2013-05-30 07:17:54 +0000
committerGreg Wilkins2013-05-30 07:17:54 +0000
commitb59949253d262fe144521258e111ef5024ef9007 (patch)
treee453a17240bccf9928e0d9042d1fba190fed4364 /jetty-osgi
parent579f8994ca7166eba5f13c02affe8e85b0fb736d (diff)
parent3a46498a27e249e3674a0f7d3441362221c27034 (diff)
downloadorg.eclipse.jetty.project-b59949253d262fe144521258e111ef5024ef9007.tar.gz
org.eclipse.jetty.project-b59949253d262fe144521258e111ef5024ef9007.tar.xz
org.eclipse.jetty.project-b59949253d262fe144521258e111ef5024ef9007.zip
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts: jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
Diffstat (limited to 'jetty-osgi')
-rw-r--r--jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml11
-rw-r--r--jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml11
2 files changed, 8 insertions, 14 deletions
diff --git a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
index 4bde8d7222..5c882b0514 100644
--- a/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
+++ b/jetty-osgi/jetty-osgi-boot/jettyhome/etc/jetty.xml
@@ -14,13 +14,10 @@
<!-- =========================================================== -->
<!-- Server Thread Pool -->
<!-- =========================================================== -->
- <Arg name="threadpool">
- <!-- Default queued blocking threadpool -->
- <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">200</Set>
- </New>
- </Arg>
+ <Get name="ThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="maxThreads">200</Set>
+ </Get>
<!-- =========================================================== -->
diff --git a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
index 4bde8d7222..170530b80e 100644
--- a/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
+++ b/jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
@@ -14,14 +14,11 @@
<!-- =========================================================== -->
<!-- Server Thread Pool -->
<!-- =========================================================== -->
- <Arg name="threadpool">
+ <Get name="ThreadPool">
<!-- Default queued blocking threadpool -->
- <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
- <Set name="minThreads">10</Set>
- <Set name="maxThreads">200</Set>
- </New>
- </Arg>
-
+ <Set name="minThreads">10</Set>
+ <Set name="maxThreads">200</Set>
+ </Get>
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->

Back to the top