Author: dkulp
Date: Sat Oct 23 03:11:54 2010
New Revision: 1026549
URL: http://svn.apache.org/viewvc?rev=1026549&view=rev
Log:
Update to latest versions of some things.
Fix issues of sessions with Jetty 7.2
Modified:
cxf/trunk/parent/pom.xml
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
cxf/trunk/rt/transports/jms/pom.xml
cxf/trunk/tools/corba/pom.xml
Modified: cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1026549&r1=1026548&r2=1026549&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Sat Oct 23 03:11:54 2010
@@ -46,7 +46,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>
@@ -59,9 +59,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>
@@ -445,6 +445,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>
@@ -905,6 +910,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>
@@ -1057,7 +1067,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
- <version>1.43</version>
+ <version>1.45</version>
</dependency>
<dependency>
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=1026549&r1=1026548&r2=1026549&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
Sat Oct 23 03:11:54 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/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1026549&r1=1026548&r2=1026549&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Sat Oct 23 03:11:54 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/trunk/tools/corba/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/tools/corba/pom.xml?rev=1026549&r1=1026548&r2=1026549&view=diff
==============================================================================
--- cxf/trunk/tools/corba/pom.xml (original)
+++ cxf/trunk/tools/corba/pom.xml Sat Oct 23 03:11:54 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>
