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/17 17:41:56 UTC
svn commit: r1104343 - in /cxf/trunk: distribution/bundle/all/
distribution/bundle/jaxrs/ distribution/bundle/minimal/
distribution/karaf/features/src/main/resources/ parent/
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/
Author: dkulp
Date: Tue May 17 15:41:56 2011
New Revision: 1104343
URL: http://svn.apache.org/viewvc?rev=1104343&view=rev
Log:
[CXF-3474] Update to latest Jetty, but set to maintain compatible with
7.3 jetty
Modified:
cxf/trunk/distribution/bundle/all/pom.xml
cxf/trunk/distribution/bundle/jaxrs/pom.xml
cxf/trunk/distribution/bundle/minimal/pom.xml
cxf/trunk/distribution/karaf/features/src/main/resources/features.xml
cxf/trunk/parent/pom.xml
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=1104343&r1=1104342&r2=1104343&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Tue May 17 15:41:56 2011
@@ -341,7 +341,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.jibx*;resolution:=optional;version="[1.2.3,2)",
Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=1104343&r1=1104342&r2=1104343&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Tue May 17 15:41:56 2011
@@ -151,7 +151,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/trunk/distribution/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=1104343&r1=1104342&r2=1104343&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Tue May 17 15:41:56 2011
@@ -201,7 +201,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/trunk/distribution/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/karaf/features/src/main/resources/features.xml?rev=1104343&r1=1104342&r2=1104343&view=diff
==============================================================================
--- cxf/trunk/distribution/karaf/features/src/main/resources/features.xml (original)
+++ cxf/trunk/distribution/karaf/features/src/main/resources/features.xml Tue May 17 15:41:56 2011
@@ -89,7 +89,7 @@
<feature version="${cxf.spring.osgi.version}">spring-dm</feature>
<feature version="${cxf.spring.version}">spring-jms</feature>
<feature version="${cxf.wss4j.version}">wss4j</feature>
- <feature version="${cxf.jetty.version}">jetty</feature>
+ <feature version="[7.2,8)">jetty</feature>
<feature version='${cxf.abdera.version}'>abdera</feature>
<bundle>mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle>
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1104343&r1=1104342&r2=1104343&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Tue May 17 15:41:56 2011
@@ -68,7 +68,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/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1104343&r1=1104342&r2=1104343&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Tue May 17 15:41:56 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
+ }
}
}
}