You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/05/24 19:40:32 UTC
svn commit: r1127173 - in /cxf/branches/2.3.x-fixes: ./
distribution/bundle/all/ distribution/bundle/jaxrs/
distribution/bundle/minimal/ parent/
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/
Author: dkulp
Date: Tue May 24 17:40:31 2011
New Revision: 1127173
URL: http://svn.apache.org/viewvc?rev=1127173&view=rev
Log:
Merged revisions 1104343 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1104343 | dkulp | 2011-05-17 11:41:56 -0400 (Tue, 17 May 2011) | 2 lines
[CXF-3474] Update to latest Jetty, but set to maintain compatible with
7.3 jetty
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml
cxf/branches/2.3.x-fixes/parent/pom.xml
cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml?rev=1127173&r1=1127172&r2=1127173&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/all/pom.xml Tue May 24 17:40:31 2011
@@ -326,7 +326,7 @@
org.codehaus.jra*;resolution:=optional,
org.codehaus.jettison*;resolution:=optional,
org.eclipse.emf*;resolution:=optional,
- org.eclipse.jetty*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional;version="[7.2,8)",
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
Modified: cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=1127173&r1=1127172&r2=1127173&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/jaxrs/pom.xml Tue May 24 17:40:31 2011
@@ -150,7 +150,7 @@
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
- org.eclipse.jetty*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
org.mozilla.javascript*;resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
Modified: cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml?rev=1127173&r1=1127172&r2=1127173&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/bundle/minimal/pom.xml Tue May 24 17:40:31 2011
@@ -206,7 +206,7 @@
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
org.junit*;resolution:=optional,
- org.eclipse.jetty*;resolution:=optional,
+ org.eclipse.jetty*;resolution:=optional;resolution:=optional;version="[7.2,8)",
org.mozilla.javascript*;resolution:=optional,
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
Modified: cxf/branches/2.3.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1127173&r1=1127172&r2=1127173&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Tue May 24 17:40:31 2011
@@ -67,7 +67,7 @@
<cxf.specs.jaxws.api.version>1.0</cxf.specs.jaxws.api.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
- <cxf.jetty.version>7.3.1.v20110307</cxf.jetty.version>
+ <cxf.jetty.version>7.4.1.v20110513</cxf.jetty.version>
<cxf.msv.version>2010.2</cxf.msv.version>
<cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.saaj.version>1.3</cxf.saaj.version>
Modified: cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1127173&r1=1127172&r2=1127173&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Tue May 24 17:40:31 2011
@@ -53,7 +53,6 @@ import org.eclipse.jetty.server.session.
import org.eclipse.jetty.server.session.SessionHandler;
import org.eclipse.jetty.server.ssl.SslSocketConnector;
import org.eclipse.jetty.util.component.Container;
-import org.eclipse.jetty.util.thread.OldQueuedThreadPool;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
@@ -461,15 +460,7 @@ public class JettyHTTPServerEngine
pool = new QueuedThreadPool();
aconn.setThreadPool(pool);
}
- if (pool instanceof OldQueuedThreadPool) {
- OldQueuedThreadPool pl = (OldQueuedThreadPool)pool;
- if (getThreadingParameters().isSetMinThreads()) {
- pl.setMinThreads(getThreadingParameters().getMinThreads());
- }
- if (getThreadingParameters().isSetMaxThreads()) {
- pl.setMaxThreads(getThreadingParameters().getMaxThreads());
- }
- } else if (pool instanceof QueuedThreadPool) {
+ if (pool instanceof QueuedThreadPool) {
QueuedThreadPool pl = (QueuedThreadPool)pool;
if (getThreadingParameters().isSetMinThreads()) {
pl.setMinThreads(getThreadingParameters().getMinThreads());
@@ -477,6 +468,20 @@ public class JettyHTTPServerEngine
if (getThreadingParameters().isSetMaxThreads()) {
pl.setMaxThreads(getThreadingParameters().getMaxThreads());
}
+ } else {
+ try {
+ if (getThreadingParameters().isSetMinThreads()) {
+ pool.getClass().getMethod("setMinThreads", Integer.TYPE)
+ .invoke(pool, getThreadingParameters().getMinThreads());
+ }
+ if (getThreadingParameters().isSetMinThreads()) {
+ pool.getClass().getMethod("setMaxThreads", Integer.TYPE)
+ .invoke(pool, getThreadingParameters().getMaxThreads());
+ }
+ } catch (Throwable t) {
+ //ignore - this won't happen for Jetty 7.1 - 7.2 and 7.3 and newer
+ //will be instanceof QueuedThreadPool above
+ }
}
}
}