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 2010/10/23 05:16:18 UTC
svn commit: r1026550 - in /cxf/branches/2.3.x-fixes: ./ parent/pom.xml
rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
rt/transports/jms/pom.xml tools/corba/pom.xml
Author: dkulp
Date: Sat Oct 23 03:16:15 2010
New Revision: 1026550
URL: http://svn.apache.org/viewvc?rev=1026550&view=rev
Log:
Merged revisions 1026549 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1026549 | dkulp | 2010-10-22 23:11:54 -0400 (Fri, 22 Oct 2010) | 2 lines
Update to latest versions of some things.
Fix issues of sessions with Jetty 7.2
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
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
cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml
cxf/branches/2.3.x-fixes/tools/corba/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Oct 23 03:16:15 2010
@@ -1 +1 @@
-/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352
+/cxf/trunk:1-1022129,1022154,1022194,1022401-1022402,1022911,1023068,1023121,1023597-1026352,1026549
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=1026550&r1=1026549&r2=1026550&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Sat Oct 23 03:16:15 2010
@@ -45,7 +45,7 @@
<cxf.eclipse.outputDirectory>${basedir}/target/classes</cxf.eclipse.outputDirectory>
<cxf.saaj.impl.groupId>com.sun.xml.messaging.saaj</cxf.saaj.impl.groupId>
<cxf.saaj.impl.artifactId>saaj-impl</cxf.saaj.impl.artifactId>
- <cxf.saaj.impl.version>1.3.2</cxf.saaj.impl.version>
+ <cxf.saaj.impl.version>1.3.4</cxf.saaj.impl.version>
<!-- please maintain alphabetical order here -->
<cxf.abdera.version>1.1</cxf.abdera.version>
@@ -58,9 +58,9 @@
<cxf.jaxb22.impl.version>2.2.1.1</cxf.jaxb22.impl.version>
<cxf.jaxb22.xjc.version>2.2.1.1</cxf.jaxb22.xjc.version>
<cxf.jdom.version>1.0</cxf.jdom.version>
- <cxf.jetty.version>7.1.6.v20100715</cxf.jetty.version>
+ <cxf.jetty.version>7.2.0.v20101020</cxf.jetty.version>
<cxf.msv.version>2010.1</cxf.msv.version>
- <cxf.rhino.version>1.7R1</cxf.rhino.version>
+ <cxf.rhino.version>1.7R2</cxf.rhino.version>
<cxf.saaj.version>1.3</cxf.saaj.version>
<cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
<cxf.servlet-api.artifact>geronimo-servlet_3.0_spec</cxf.servlet-api.artifact>
@@ -443,6 +443,11 @@
<version>1.4.2</version>
</dependency>
<dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.specs</groupId>
<artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
<version>1.5.0</version>
@@ -903,6 +908,11 @@
<version>1.4</version>
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.5.5</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
@@ -1055,7 +1065,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
- <version>1.43</version>
+ <version>1.45</version>
</dependency>
<dependency>
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=1026550&r1=1026549&r2=1026550&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 Sat Oct 23 03:16:15 2010
@@ -406,10 +406,8 @@ public class JettyHTTPServerEngine
sessionManager.setIdManager(idManager);
}
SessionHandler sessionHandler = new SessionHandler(sessionManager);
- HandlerCollection hc = new HandlerCollection();
- hc.addHandler(handler);
- hc.addHandler(sessionHandler);
- context.setHandler(hc);
+ sessionHandler.setHandler(handler);
+ context.setHandler(sessionHandler);
} else {
// otherwise, just the one.
context.setHandler(handler);
Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml?rev=1026550&r1=1026549&r2=1026550&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml Sat Oct 23 03:16:15 2010
@@ -89,7 +89,6 @@
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.5.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: cxf/branches/2.3.x-fixes/tools/corba/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/corba/pom.xml?rev=1026550&r1=1026549&r2=1026550&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/corba/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/tools/corba/pom.xml Sat Oct 23 03:16:15 2010
@@ -60,9 +60,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>antlr</groupId>
+ <groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
- <version>2.7.7</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>