cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r979132 [1/3] - in /cxf/trunk: distribution/src/main/release/lib/ integration/jca/src/main/java/org/apache/cxf/jca/cxf/ integration/jca/src/main/java/org/apache/cxf/jca/servant/ parent/ rt/bindings/http/src/test/java/org/apache/cxf/binding/...
Date Mon, 26 Jul 2010 01:43:38 GMT
Author: dkulp
Date: Mon Jul 26 01:43:35 2010
New Revision: 979132

URL: http://svn.apache.org/viewvc?rev=979132&view=rev
Log:
Squashed commit of the following:

commit ee05a355e11051c2ef52bc9113a42b3bacebd69d
Author: Daniel Kulp <dkulp@apache.org>
Date:   Fri Jul 23 16:50:35 2010 -0400

    Update for jetty7 jars

commit 5142eb453d4055bb704ae43fd9a60bccafbd4554
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Fri Jul 23 17:17:23 2010 +0000

    Fix flushing of buffers and such to not always use chunking on
    responses.  Fix jaxrs tests

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@967167 13f79535-47bb-0310-9956-ffa450edef68

commit 8febb52ad4e823c9cadd3a457502149e5e1d081c
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Fri Jul 23 02:48:19 2010 +0000

    Remove leftover println

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966939 13f79535-47bb-0310-9956-ffa450edef68

commit 92c686bd3005dccdcfe29d5a1badb12cbf4ac395
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Fri Jul 23 02:44:48 2010 +0000

    Fix logging tests

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966938 13f79535-47bb-0310-9956-ffa450edef68

commit 5ba1a413596e8ac5e8fdb8068465ab6db8bbd766
Author: Benson Margulies <bimargulies@apache.org>
Date:   Fri Jul 23 01:47:05 2010 +0000

    more integration test framework

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966932 13f79535-47bb-0310-9956-ffa450edef68

commit 1c2ad2d795d35eb9d30a7f4788b91982d46f7b49
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Fri Jul 23 01:39:32 2010 +0000

    Workaround bug in jetty

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966930 13f79535-47bb-0310-9956-ffa450edef68

commit d43360f18169d049396fe9fb9c12449ba5635545
Author: Benson Margulies <bimargulies@apache.org>
Date:   Fri Jul 23 01:27:30 2010 +0000

    start to set up a container integration test

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966926 13f79535-47bb-0310-9956-ffa450edef68

commit cb336ce8d57c2d13acd12519983507a17b72b97b
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Thu Jul 22 21:09:36 2010 +0000

    Get more tests working

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966858 13f79535-47bb-0310-9956-ffa450edef68

commit 96f387419acd3df013365cea87d208b62a1a4e2a
Author: Benson Margulies <bimargulies@apache.org>
Date:   Thu Jul 22 00:08:47 2010 +0000

    Fix unit test error when spring configs more than one handler for the jetty instance

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966466 13f79535-47bb-0310-9956-ffa450edef68

commit 23d58f6b19fe5861f6f56ea2f672bf121ee20a48
Author: Benson Margulies <bimargulies@apache.org>
Date:   Wed Jul 21 02:58:26 2010 +0000

    checkstyle in jetty changes

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966074 13f79535-47bb-0310-9956-ffa450edef68

commit 1203562d950452173cccaf8b4ce4b231c8d210aa
Author: Benson Margulies <bimargulies@apache.org>
Date:   Wed Jul 21 02:12:16 2010 +0000

    all uncategorized sys tests now pass

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966068 13f79535-47bb-0310-9956-ffa450edef68

commit 7525bb0a7e881073c5371eb7fe329db79c5fce45
Author: Benson Margulies <bimargulies@apache.org>
Date:   Tue Jul 20 22:46:19 2010 +0000

    Get at least one of the failing systests to pass

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966046 13f79535-47bb-0310-9956-ffa450edef68

commit 52428464d377d2440484a2e0c614a4828ec0e7c0
Author: Benson Margulies <bimargulies@apache.org>
Date:   Tue Jul 20 22:22:16 2010 +0000

    Closer to right with the jetty handlers. More to come

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@966038 13f79535-47bb-0310-9956-ffa450edef68

commit 8d0304968a1af7792d01586f8429260b4173f45b
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Tue Jul 20 17:34:03 2010 +0000

    Another unit test fix

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@965925 13f79535-47bb-0310-9956-ffa450edef68

commit 9ada6e2f8475d53c6a25d4f650ad7bbf00f17111
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Tue Jul 20 17:33:54 2010 +0000

    Unit test updates

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@965924 13f79535-47bb-0310-9956-ffa450edef68

commit 8829f5793c3cecabe635fe6fb9ccbc025c30fc82
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Mon Jul 19 21:25:51 2010 +0000

    More work toward jetty 7

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@965643 13f79535-47bb-0310-9956-ffa450edef68

commit 0619ad5166c2a144693debca72fa13722c6a1381
Author: J. Daniel Kulp <dkulp@apache.org>
Date:   Mon Jul 19 21:25:24 2010 +0000

    [maven-release-plugin] prepare release servlet3jetty7

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@965642 13f79535-47bb-0310-9956-ffa450edef68

commit aed718ac4dc24df8a049c429804825820d40a133
Author: Benson Margulies <bimargulies@apache.org>
Date:   Sun Jul 18 17:37:08 2010 +0000

    CXF-2898: everything except continuation code compiles

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@965265 13f79535-47bb-0310-9956-ffa450edef68

commit aed303cc99a78048d39953df30117ae04ab0485a
Author: Benson Margulies <bimargulies@apache.org>
Date:   Sun Jul 18 16:55:01 2010 +0000

    CXF-2898: first pass of changes for sv3 and jetty7, only making changes that I'm confident of as I go

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@965261 13f79535-47bb-0310-9956-ffa450edef68

commit 9fbcbeb37d49cb5511ad75ad336e489485d5cf42
Author: Benson Margulies <bimargulies@apache.org>
Date:   Sun Jul 18 14:23:27 2010 +0000

    [maven-release-plugin]  copy for branch servlet3jetty7

    git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/servlet3jetty7@965235 13f79535-47bb-0310-9956-ffa450edef68

Added:
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java   (with props)
    cxf/trunk/systests/container-integration/
    cxf/trunk/systests/container-integration/jetty6/
    cxf/trunk/systests/container-integration/jetty6/pom.xml   (with props)
    cxf/trunk/systests/container-integration/pom.xml   (with props)
    cxf/trunk/systests/container-integration/webapp/
    cxf/trunk/systests/container-integration/webapp/pom.xml   (with props)
    cxf/trunk/systests/container-integration/webapp/src/
    cxf/trunk/systests/container-integration/webapp/src/main/
    cxf/trunk/systests/container-integration/webapp/src/main/java/
    cxf/trunk/systests/container-integration/webapp/src/main/java/demo/
    cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/
    cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java
      - copied, changed from r978913, cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java
    cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java
      - copied, changed from r978913, cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java
    cxf/trunk/systests/container-integration/webapp/src/main/webapp/
    cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/
    cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml   (with props)
    cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml   (with props)
Removed:
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationProviderTest.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapperTest.java
Modified:
    cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
    cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java
    cxf/trunk/rt/frontend/jaxrs/pom.xml
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
    cxf/trunk/rt/frontend/jaxws/pom.xml
    cxf/trunk/rt/javascript/pom.xml
    cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml
    cxf/trunk/rt/transports/http-jetty/pom.xml
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationProvider.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml
    cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
    cxf/trunk/rt/transports/http-osgi/pom.xml
    cxf/trunk/rt/transports/http/pom.xml
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
    cxf/trunk/systests/databinding/pom.xml
    cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
    cxf/trunk/systests/jaxrs/pom.xml
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties
    cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
    cxf/trunk/systests/jaxws/pom.xml
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
    cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
    cxf/trunk/systests/transports/pom.xml
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
    cxf/trunk/systests/uncategorized/pom.xml
    cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java
    cxf/trunk/systests/ws-specs/pom.xml
    cxf/trunk/tools/wsdlto/test/pom.xml
    cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java

Modified: cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/lib/WHICH_JARS (original)
+++ cxf/trunk/distribution/src/main/release/lib/WHICH_JARS Mon Jul 26 01:43:35 2010
@@ -57,8 +57,7 @@ For XML Configuration support:
 
 For standalone HTTP support:
 - geronimo-servlet.jar
-- jetty.jar
-- jetty-util.jar
+- jetty-*.jar
 - sl4j.jar & sl4j-jdk14.jar (optional - but improves logging)
  
 For Aegis support:

Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java Mon Jul 26 01:43:35 2010
@@ -24,7 +24,7 @@ import javax.resource.spi.work.WorkEvent
 import javax.resource.spi.work.WorkException;
 import javax.resource.spi.work.WorkManager;
 
-import org.mortbay.thread.ThreadPool;
+import org.eclipse.jetty.util.thread.ThreadPool;
 
 /**
  * The adapter for using Application Server's thread pool. 

Modified: cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java (original)
+++ cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java Mon Jul 26 01:43:35 2010
@@ -41,8 +41,8 @@ import org.apache.cxf.jaxws.JaxWsServerF
 import org.apache.cxf.jca.cxf.WorkManagerThreadPool;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
-import org.mortbay.jetty.AbstractConnector;
-import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.AbstractConnector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 
 
 public class EJBEndpoint {

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Jul 26 01:43:35 2010
@@ -58,10 +58,13 @@
         <jaxb22.impl.version>2.2.1.1</jaxb22.impl.version>
         <jaxb22.xjc.version>2.2.1.1</jaxb22.xjc.version>
         <jdom.version>1.0</jdom.version>
-        <jetty.version>6.1.24</jetty.version>
+        <jetty.version>7.1.5.v20100705</jetty.version>
         <msv.version>2009.1</msv.version>
         <rhino.version>1.7R1</rhino.version>
         <saaj.version>1.3</saaj.version>
+	<servlet-api.group>org.apache.geronimo.specs</servlet-api.group>
+	<servlet-api.artifact>geronimo-servlet_3.0_spec</servlet-api.artifact>
+	<servlet-api.version>1.0</servlet-api.version>
         <spring.version>2.5.6</spring.version>
         <spring.mock>spring-test</spring.mock>
         <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
@@ -522,21 +525,27 @@
                 <version>1.6.1</version>
             </dependency>
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
                 <version>${jetty.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>servlet-api-2.5</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.mortbay.jetty</groupId>
+                        <groupId>javax.servlet</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-webapp</artifactId>
+                <version>${jetty.version}</version>
+	    </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.version}</version>
+	    </dependency>
+            <dependency>
                 <groupId>xalan</groupId>
                 <artifactId>xalan</artifactId>
                 <version>2.7.1</version>
@@ -873,9 +882,9 @@
                 <version>1.1.1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.2</version>
+                <groupId>${servlet-api.group}</groupId>
+                <artifactId>${servlet-api.artifact}</artifactId>
+                <version>${servlet-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>

Modified: cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java (original)
+++ cxf/trunk/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java Mon Jul 26 01:43:35 2010
@@ -187,7 +187,7 @@ public class BareServiceTest extends Abs
         HttpURLConnection c = (HttpURLConnection)url.openConnection();
         c.setRequestMethod("GET");
 
-        assertEquals("text/xml; charset=utf-8", c.getContentType());
+        assertEquals("text/xml;charset=utf-8", c.getContentType().toLowerCase());
 
         Document doc = DOMUtils.readXml(c.getErrorStream());
         Message msg = new Message("SIMPLE_TYPE", IriDecoderHelper.BUNDLE);
@@ -216,7 +216,7 @@ public class BareServiceTest extends Abs
         HttpURLConnection c = (HttpURLConnection)url.openConnection();
         c.setRequestMethod("GET");
 
-        assertEquals("text/xml; charset=utf-8", c.getContentType());
+        assertEquals("text/xml;charset=utf-8", c.getContentType().toLowerCase());
 
         Document doc = DOMUtils.readXml(c.getInputStream());
         addNamespace("b", "http://bare.http.binding.cxf.apache.org/");

Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Mon Jul 26 01:43:35 2010
@@ -134,8 +134,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <groupId>${servlet-api.group}</groupId>
+            <artifactId>${servlet-api.artifact}</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletRequest.java Mon Jul 26 01:43:35 2010
@@ -23,15 +23,24 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.Principal;
+import java.util.Collection;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
 
+import javax.servlet.AsyncContext;
+import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.servlet.http.Part;
 
 public class ThreadLocalHttpServletRequest extends AbstractThreadLocalProxy<HttpServletRequest> 
     implements HttpServletRequest {
@@ -56,11 +65,11 @@ public class ThreadLocalHttpServletReque
         return get().getHeader(name);
     }
 
-    public Enumeration getHeaderNames() {
+    public Enumeration<String> getHeaderNames() {
         return get().getHeaderNames();
     }
 
-    public Enumeration getHeaders(String name) {
+    public Enumeration<String> getHeaders(String name) {
         return get().getHeaders(name);
     }
 
@@ -141,7 +150,7 @@ public class ThreadLocalHttpServletReque
         return get().getAttribute(name);
     }
 
-    public Enumeration getAttributeNames() {
+    public Enumeration<String> getAttributeNames() {
         return get().getAttributeNames();
     }
 
@@ -177,7 +186,7 @@ public class ThreadLocalHttpServletReque
         return get().getLocale();
     }
 
-    public Enumeration getLocales() {
+    public Enumeration<Locale> getLocales() {
         return get().getLocales();
     }
 
@@ -185,11 +194,11 @@ public class ThreadLocalHttpServletReque
         return get().getParameter(name);
     }
 
-    public Map getParameterMap() {
+    public Map<String, String[]> getParameterMap() {
         return get().getParameterMap();
     }
 
-    public Enumeration getParameterNames() {
+    public Enumeration<String> getParameterNames() {
         return get().getParameterNames();
     }
 
@@ -257,4 +266,63 @@ public class ThreadLocalHttpServletReque
 
     }
 
+    @Override
+    public AsyncContext getAsyncContext() {
+        return get().getAsyncContext();
+    }
+
+    @Override
+    public DispatcherType getDispatcherType() {
+        return get().getDispatcherType();
+    }
+
+    @Override
+    public ServletContext getServletContext() {
+        return get().getServletContext();
+    }
+
+    @Override
+    public boolean isAsyncStarted() {
+        return get().isAsyncStarted();
+    }
+
+    @Override
+    public boolean isAsyncSupported() {
+        return get().isAsyncSupported();
+    }
+
+    @Override
+    public AsyncContext startAsync() {
+        return get().startAsync();
+    }
+
+    @Override
+    public AsyncContext startAsync(ServletRequest request, ServletResponse response) {
+        return get().startAsync(request, response);
+    }
+
+    @Override
+    public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
+        return get().authenticate(response);
+    }
+
+    @Override
+    public Part getPart(String name) throws IOException, ServletException {
+        return get().getPart(name);
+    }
+
+    @Override
+    public Collection<Part> getParts() throws IOException, ServletException {
+        return get().getParts();
+    }
+
+    @Override
+    public void login(String username, String password) throws ServletException {
+        get().login(username, password);
+    }
+
+    @Override
+    public void logout() throws ServletException {
+        get().logout();
+    }
 }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalHttpServletResponse.java Mon Jul 26 01:43:35 2010
@@ -21,6 +21,7 @@ package org.apache.cxf.jaxrs.impl.tl;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Collection;
 import java.util.Locale;
 
 import javax.servlet.ServletOutputStream;
@@ -174,6 +175,26 @@ public class ThreadLocalHttpServletRespo
         
     }
 
+    @Override
+    public String getHeader(String name) {
+        return get().getHeader(name);
+    }
+
+    @Override
+    public Collection<String> getHeaderNames() {
+        return get().getHeaderNames();
+    }
+
+    @Override
+    public Collection<String> getHeaders(String headerName) {
+        return get().getHeaders(headerName);
+    }
+
+    @Override
+    public int getStatus() {
+        return get().getStatus();
+    }
+
     
 
 }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletConfig.java Mon Jul 26 01:43:35 2010
@@ -32,7 +32,7 @@ public class ThreadLocalServletConfig ex
         return get().getInitParameter(name);
     }
 
-    public Enumeration getInitParameterNames() {
+    public Enumeration<String> getInitParameterNames() {
         return get().getInitParameterNames();
     }
 

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalServletContext.java Mon Jul 26 01:43:35 2010
@@ -23,12 +23,21 @@ import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
 import java.util.Set;
 
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
+import javax.servlet.ServletRegistration;
+import javax.servlet.ServletRegistration.Dynamic;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 public class ThreadLocalServletContext extends AbstractThreadLocalProxy<ServletContext> 
     implements ServletContext {
@@ -37,7 +46,7 @@ public class ThreadLocalServletContext e
         return get().getAttribute(name);
     }
 
-    public Enumeration getAttributeNames() {
+    public Enumeration<String> getAttributeNames() {
         return get().getAttributeNames();
     }
 
@@ -53,7 +62,7 @@ public class ThreadLocalServletContext e
         return get().getInitParameter(name);
     }
 
-    public Enumeration getInitParameterNames() {
+    public Enumeration<String> getInitParameterNames() {
         return get().getInitParameterNames();
     }
 
@@ -89,7 +98,7 @@ public class ThreadLocalServletContext e
         return get().getResourceAsStream(path);
     }
 
-    public Set getResourcePaths(String path) {
+    public Set<String> getResourcePaths(String path) {
         return get().getResourcePaths(path);
     }
 
@@ -107,12 +116,12 @@ public class ThreadLocalServletContext e
     }
 
     @SuppressWarnings("deprecation")
-    public Enumeration getServletNames() {
+    public Enumeration<String> getServletNames() {
         return get().getServletNames();
     }
 
     @SuppressWarnings("deprecation")
-    public Enumeration getServlets() {
+    public Enumeration<Servlet> getServlets() {
         return get().getServlets();
     }
 
@@ -138,4 +147,143 @@ public class ThreadLocalServletContext e
         
     }
 
+    @Override
+    public boolean setInitParameter(String name, String value) {
+        return get().setInitParameter(name, value);
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, String className) throws IllegalArgumentException,
+        IllegalStateException {
+        return get().addServlet(servletName, className);
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, Servlet servlet) throws IllegalArgumentException,
+        IllegalStateException {
+        return get().addServlet(servletName, servlet);
+    }
+
+    @Override
+    public Dynamic addServlet(String servletName, Class<? extends Servlet> clazz)
+        throws IllegalArgumentException, IllegalStateException {
+        return get().addServlet(servletName, clazz);
+    }
+
+    @Override
+    public <T extends Servlet> T createServlet(Class<T> clazz) throws ServletException {
+        return get().createServlet(clazz);
+    }
+
+    @Override
+    public ServletRegistration getServletRegistration(String servletName) {
+        return get().getServletRegistration(servletName);
+    }
+
+    @Override
+    public Map<String, ? extends ServletRegistration> getServletRegistrations() {
+        return get().getServletRegistrations();
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className)
+        throws IllegalArgumentException, IllegalStateException {
+        return get().addFilter(filterName, className);
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter)
+        throws IllegalArgumentException, IllegalStateException {
+        return get().addFilter(filterName, filter);
+    }
+
+    @Override
+    public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName,
+                                                              Class<? extends Filter> filterClass)
+        throws IllegalArgumentException, IllegalStateException {
+        return get().addFilter(filterName, filterClass);
+    }
+
+    @Override
+    public <T extends Filter> T createFilter(Class<T> clazz) throws ServletException {
+        return get().createFilter(clazz);
+    }
+
+    @Override
+    public FilterRegistration getFilterRegistration(String filterName) {
+        return get().getFilterRegistration(filterName);
+    }
+
+    @Override
+    public Map<String, ? extends FilterRegistration> getFilterRegistrations() {
+        return get().getFilterRegistrations();
+    }
+
+    @Override
+    public void addListener(Class<? extends EventListener> listenerClass) {
+        get().addListener(listenerClass);
+    }
+
+    @Override
+    public void addListener(String className) {
+        get().addListener(className);
+        
+    }
+
+    @Override
+    public <T extends EventListener> void addListener(T t) {
+        get().addListener(t);
+    }
+
+    @Override
+    public <T extends EventListener> T createListener(Class<T> clazz) throws ServletException {
+        return get().createListener(clazz);
+    }
+
+    @Override
+    public void declareRoles(String... roleNames) {
+        get().declareRoles(roleNames);
+    }
+
+    @Override
+    public SessionCookieConfig getSessionCookieConfig() {
+        return get().getSessionCookieConfig();
+    }
+
+    @Override
+    public void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes) {
+        get().setSessionTrackingModes(sessionTrackingModes);
+        
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getDefaultSessionTrackingModes() {
+        return get().getDefaultSessionTrackingModes();
+    }
+
+    @Override
+    public int getEffectiveMajorVersion() throws UnsupportedOperationException {
+        return get().getEffectiveMajorVersion();
+    }
+
+    @Override
+    public int getEffectiveMinorVersion() throws UnsupportedOperationException {
+        return get().getEffectiveMinorVersion();
+    }
+
+    @Override
+    public Set<SessionTrackingMode> getEffectiveSessionTrackingModes() {
+        return get().getEffectiveSessionTrackingModes();
+    }
+
+    @Override
+    public ClassLoader getClassLoader() {
+        return get().getClassLoader();
+    }
+
+    @Override
+    public JspConfigDescriptor getJspConfigDescriptor() {
+        return get().getJspConfigDescriptor();
+    }
+
 }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/RequestDispatcherProvider.java Mon Jul 26 01:43:35 2010
@@ -206,7 +206,6 @@ public class RequestDispatcherProvider e
         private String path;
         private String servletPath;
         
-        @SuppressWarnings("unchecked")
         public HttpServletRequestFilter(HttpServletRequest request, String path, String servletPath) {
             super(request);
             this.path = path;
@@ -247,7 +246,7 @@ public class RequestDispatcherProvider e
         }
         
         @Override
-        public Map getParameterMap() {
+        public Map<String, String[]> getParameterMap() {
             return params;
         }
         

Modified: cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxws/pom.xml Mon Jul 26 01:43:35 2010
@@ -134,11 +134,10 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <groupId>${servlet-api.group}</groupId>
+            <artifactId>${servlet-api.artifact}</artifactId>
             <scope>provided</scope>
         </dependency>        
-
     </dependencies>
 
     <build>

Modified: cxf/trunk/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/pom.xml (original)
+++ cxf/trunk/rt/javascript/pom.xml Mon Jul 26 01:43:35 2010
@@ -88,8 +88,8 @@
            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
             <version>${jetty.version}</version>
            <scope>test</scope>
         </dependency>       

Modified: cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml (original)
+++ cxf/trunk/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml Mon Jul 26 01:43:35 2010
@@ -41,17 +41,17 @@
 	<httpj:engine-factory bus="cxf">
 		<httpj:engine port="8808">
 			<httpj:handlers>
-				<bean class="org.mortbay.jetty.handler.ContextHandler">
+				<bean class="org.eclipse.jetty.server.handler.ContextHandler">
 					<property name="contextPath" value="/" />
 					<property name="handler">
-						<bean class="org.mortbay.jetty.handler.ResourceHandler">
+						<bean class="org.eclipse.jetty.server.handler.ResourceHandler">
 							<property name="baseResource">
-								<bean class="org.mortbay.resource.FileResource">
+								<bean class="org.eclipse.jetty.util.resource.FileResource">
 									<constructor-arg value="${staticResourceURL}" />
 								</bean>
 							</property>
 							<property name="mimeTypes">
-								<bean class="org.mortbay.jetty.MimeTypes">
+								<bean class="org.eclipse.jetty.http.MimeTypes">
 									<property name="mimeMap">
 									    <map>
 									    	<entry key="html"><value>text/html; charset="utf-8"</value></entry>
@@ -62,7 +62,7 @@
 						</bean>
 					</property>
 				</bean>
-				<bean class="org.mortbay.jetty.handler.DefaultHandler" />
+				<bean class="org.eclipse.jetty.server.handler.DefaultHandler" />
 			</httpj:handlers>
 		</httpj:engine>
 	</httpj:engine-factory>

Modified: cxf/trunk/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/pom.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/pom.xml Mon Jul 26 01:43:35 2010
@@ -53,13 +53,13 @@
             <artifactId>spring-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
             <version>${jetty.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty-management</artifactId>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-jmx</artifactId>
             <version>${jetty.version}</version>
             <optional>true</optional>
         </dependency>       
@@ -69,8 +69,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <groupId>${servlet-api.group}</groupId>
+            <artifactId>${servlet-api.artifact}</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java Mon Jul 26 01:43:35 2010
@@ -18,7 +18,7 @@
  */
 package org.apache.cxf.transport.http_jetty;
 
-import org.mortbay.jetty.AbstractConnector;
+import org.eclipse.jetty.server.AbstractConnector;
 
 
 /**

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java Mon Jul 26 01:43:35 2010
@@ -19,7 +19,7 @@
 package org.apache.cxf.transport.http_jetty;
 
 import org.apache.cxf.endpoint.ContextInspector;
-import org.mortbay.jetty.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ContextHandler;
 
 public class JettyContextInspector implements ContextInspector {
     

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java Mon Jul 26 01:43:35 2010
@@ -34,7 +34,6 @@ import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.jsse.TLSServerParameters;
 import org.apache.cxf.configuration.security.CertificateConstraintsType;
-import org.apache.cxf.continuations.ContinuationInfo;
 import org.apache.cxf.continuations.ContinuationProvider;
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.interceptor.Fault;
@@ -46,15 +45,12 @@ import org.apache.cxf.service.model.Endp
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transport.http.HTTPSession;
 import org.apache.cxf.transport.http_jetty.continuations.JettyContinuationProvider;
-import org.apache.cxf.transport.http_jetty.continuations.JettyContinuationWrapper;
 import org.apache.cxf.transport.https.CertConstraintsJaxBUtils;
 import org.apache.cxf.transports.http.QueryHandler;
 import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.transports.http.StemMatchingQueryHandler;
-import org.mortbay.jetty.HttpConnection;
-import org.mortbay.jetty.Request;
-import org.mortbay.util.ajax.Continuation;
-import org.mortbay.util.ajax.ContinuationSupport;
+import org.eclipse.jetty.server.HttpConnection;
+import org.eclipse.jetty.server.Request;
 
 public class JettyHTTPDestination extends AbstractHTTPDestination {
     
@@ -219,6 +215,14 @@ public class JettyHTTPDestination extend
         Request baseRequest = (req instanceof Request) 
             ? (Request)req : HttpConnection.getCurrentConnection().getRequest();
             
+        if (!"HEAD".equals(req.getMethod())) {
+            //bug in Jetty with persistent connections that if a HEAD is
+            //sent, a _head flag is never reset
+            HttpConnection c = baseRequest.getConnection();
+            if (c != null) {
+                c.getGenerator().setHead(false);
+            }
+        }
         if (getServer().isSetRedirectURL()) {
             resp.sendRedirect(getServer().getRedirectURL());
             resp.flushBuffer();
@@ -294,11 +298,6 @@ public class JettyHTTPDestination extend
         if (inMessage == null) {
             
             inMessage = new MessageImpl();
-            if (engine.getContinuationsEnabled()) {
-                inMessage.put(ContinuationProvider.class.getName(), 
-                          new JettyContinuationProvider(req, inMessage));
-            }
-            
             setupMessage(inMessage, context, req, resp);
             
             ((MessageImpl)inMessage).setDestination(this);
@@ -312,17 +311,11 @@ public class JettyHTTPDestination extend
             incomingObserver.onMessage(inMessage);
             resp.flushBuffer();
             baseRequest.setHandled(true);
-            JettyContinuationProvider p = (JettyContinuationProvider)inMessage
-                .get(ContinuationProvider.class.getName());
-            if (p != null) {
-                //make sure the continuation is stripped down 
-                JettyContinuationWrapper c = p.getContinuation(false);
-                if (c != null) {
-                    c.done();
-                }
-            }
         } catch (SuspendedInvocationException ex) {
-            throw ex.getRuntimeException();
+            if (ex.getRuntimeException() != null) {
+                throw ex.getRuntimeException();
+            }
+            //else nothing to do
         } catch (Fault ex) {
             Throwable cause = ex.getCause();
             if (cause instanceof RuntimeException) {
@@ -339,38 +332,6 @@ public class JettyHTTPDestination extend
         }
     }
 
-    protected Message retrieveFromContinuation(HttpServletRequest req) {
-        Message m = null;
-        
-        if (!engine.getContinuationsEnabled()) {
-            return null;
-        }
-        
-        Continuation cont = ContinuationSupport.getContinuation(req, null);
-        synchronized (cont) {
-            Object o = cont.getObject();
-            if (o instanceof ContinuationInfo) {
-                ContinuationInfo ci = (ContinuationInfo)o;
-                m = ci.getMessage();
-                
-                // now that we got the message we don't need ContinuationInfo
-                // as we don't know how continuation was suspended, by jetty wrapper
-                // or directly in which (latter) case we need to ensure that an original user object
-                // if any, need to be restored
-                cont.setObject(ci.getUserObject());
-            }
-            if (m == null && (cont.isPending() || cont.isResumed())) {
-                String message = "No message for existing continuation, status : "
-                    + (cont.isPending() ? "Pending" : "Resumed");
-                if (!(o instanceof ContinuationInfo)) {
-                    message += ", ContinuationInfo object is unavailable";
-                }
-                LOG.warning(message);
-            }
-        }
-        return m;
-    }
-    
     @Override
     public void shutdown() {
         transportFactory.removeDestination(endpointInfo);
@@ -385,4 +346,16 @@ public class JettyHTTPDestination extend
     private String getStem(String baseURI) {    
         return baseURI.substring(0, baseURI.lastIndexOf("/"));
     }
+    
+    protected Message retrieveFromContinuation(HttpServletRequest req) {
+        return (Message)req.getAttribute(CXF_CONTINUATION_MESSAGE);
+    }
+    protected void setupContinuation(Message inMessage,
+                      final HttpServletRequest req, 
+                      final HttpServletResponse resp) {
+        if (engine.getContinuationsEnabled()) {
+            inMessage.put(ContinuationProvider.class.getName(), 
+                      new JettyContinuationProvider(req, resp, inMessage));
+        }
+    }
 }

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java Mon Jul 26 01:43:35 2010
@@ -21,10 +21,12 @@ package org.apache.cxf.transport.http_je
 import java.io.IOException;
 
 import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.mortbay.jetty.handler.AbstractHandler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.handler.AbstractHandler;
 
 public class JettyHTTPHandler extends AbstractHandler {
     private String urlName;
@@ -59,17 +61,19 @@ public class JettyHTTPHandler extends Ab
         return target.startsWith(pathString);
     }
 
-    public void handle(String target, HttpServletRequest req,
-                       HttpServletResponse resp, int dispatch) throws IOException {
+    @Override
+    public void handle(String target, Request baseRequest, HttpServletRequest request,
+                       HttpServletResponse response) throws IOException, ServletException {
         if (contextMatchExact) {
             if (target.equals(urlName)) {
-                jettyHTTPDestination.doService(servletContext, req, resp);
+                jettyHTTPDestination.doService(servletContext, request, response);
             }
         } else {
             if (target.equals(urlName) || checkContextPath(target)) {
-                jettyHTTPDestination.doService(servletContext, req, resp);
+                jettyHTTPDestination.doService(servletContext, request, response);
             }
         }
+        
     }
 
 

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=979132&r1=979131&r2=979132&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 Mon Jul 26 01:43:35 2010
@@ -21,7 +21,6 @@ package org.apache.cxf.transport.http_je
 
 import java.io.IOException;
 import java.net.URL;
-
 import java.security.GeneralSecurityException;
 import java.util.List;
 import java.util.logging.Level;
@@ -38,21 +37,23 @@ import org.apache.cxf.configuration.jsse
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.transport.HttpUriMapper;
 import org.apache.cxf.transport.https_jetty.JettySslConnectorFactory;
-import org.mortbay.component.Container;
-import org.mortbay.jetty.AbstractConnector;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerList;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.SslSocketConnector;
-import org.mortbay.jetty.servlet.HashSessionIdManager;
-import org.mortbay.jetty.servlet.HashSessionManager;
-import org.mortbay.jetty.servlet.SessionHandler;
-import org.mortbay.thread.QueuedThreadPool;
+import org.eclipse.jetty.server.AbstractConnector;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerCollection;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.session.HashSessionIdManager;
+import org.eclipse.jetty.server.session.HashSessionManager;
+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;
 
 
 /**
@@ -292,7 +293,6 @@ public class JettyHTTPServerEngine
      * @param url the URL associated with the servant
      * @param handler notified on incoming HTTP requests
      */
-    @SuppressWarnings("deprecation")
     public synchronized void addServant(URL url, JettyHTTPHandler handler) {
         if (server == null) {
             DefaultHandler defaultHandler = null;
@@ -314,50 +314,70 @@ public class JettyHTTPServerEngine
                     LOG.finer("connector.port: " + connector.getPort());
                 }
             } 
-            server.addConnector(connector);            
+
+            server.addConnector(connector);
+            /*
+             * The server may have no handler, it might have a collection handler,
+             * it might have a one-shot. We need to add one or more of ours.
+             *
+             */
+            int numberOfHandlers = 1;
+            if (handlers != null) {
+                numberOfHandlers += handlers.size();
+            }
+            Handler existingHandler = server.getHandler();
+
+            HandlerCollection handlerCollection = null;
+            boolean existingHandlerCollection = existingHandler instanceof HandlerCollection;
+            if (existingHandlerCollection) {
+                handlerCollection = (HandlerCollection) existingHandler;
+            }
+
+            if (!existingHandlerCollection 
+                &&
+                (existingHandler != null || numberOfHandlers > 1)) {
+                handlerCollection = new HandlerCollection();
+                if (existingHandler != null) {
+                    handlerCollection.addHandler(existingHandler);
+                }
+                server.setHandler(handlerCollection);
+            }
+            
+            /*
+             * At this point, the server's handler is a collection. It was either
+             * one to start, or it is now one containing only the single handler
+             * that was there to begin with.
+             */
+
             if (handlers != null && handlers.size() > 0) {
-                HandlerList handlerList = new HandlerList();
                 for (Handler h : handlers) {
-                    // filting the jetty default handler 
-                    // which should not be added at this point
+                    // Filtering out the jetty default handler 
+                    // which should not be added at this point.
                     if (h instanceof DefaultHandler) {
                         defaultHandler = (DefaultHandler) h;
                     } else {
-                        handlerList.addHandler(h);
+                        handlerCollection.addHandler(h);
                     }
                 }
-                server.addHandler(handlerList);
             }
             contexts = new ContextHandlerCollection();
-            server.addHandler(contexts);
-            if (defaultHandler != null) {
-                server.addHandler(defaultHandler);
+            /*
+             * handlerCollection may be null here if is only one handler to deal with.
+             * Which in turn implies that there can't be a 'defaultHander' to deal with.
+             */
+            if (handlerCollection != null) {
+                handlerCollection.addHandler(contexts);
+                if (defaultHandler != null) {
+                    handlerCollection.addHandler(defaultHandler);
+                }
+            } else {
+                server.setHandler(contexts);
             }
+
             try {                
                 setReuseAddress(connector);
+                setupThreadPool();
                 server.start();
-               
-                AbstractConnector aconn = (AbstractConnector) connector;
-                if (isSetThreadingParameters()) {
-                    if (aconn.getThreadPool() instanceof org.mortbay.thread.BoundedThreadPool) {
-                        org.mortbay.thread.BoundedThreadPool pool 
-                            = (org.mortbay.thread.BoundedThreadPool)aconn.getThreadPool();
-                        if (getThreadingParameters().isSetMinThreads()) {
-                            pool.setMinThreads(getThreadingParameters().getMinThreads());
-                        }
-                        if (getThreadingParameters().isSetMaxThreads()) {
-                            pool.setMaxThreads(getThreadingParameters().getMaxThreads());
-                        }
-                    } else if (aconn.getThreadPool() instanceof QueuedThreadPool) {
-                        QueuedThreadPool pool = (QueuedThreadPool)aconn.getThreadPool();
-                        if (getThreadingParameters().isSetMinThreads()) {
-                            pool.setMinThreads(getThreadingParameters().getMinThreads());
-                        }
-                        if (getThreadingParameters().isSetMaxThreads()) {
-                            pool.setMaxThreads(getThreadingParameters().getMaxThreads());
-                        }
-                    }
-                }
             } catch (Exception e) {
                 LOG.log(Level.SEVERE, "START_UP_SERVER_FAILED_MSG", new Object[] {e.getMessage(), port});
                 //problem starting server
@@ -375,15 +395,20 @@ public class JettyHTTPServerEngine
         String contextName = HttpUriMapper.getContextName(url.getPath());            
         ContextHandler context = new ContextHandler();
         context.setContextPath(contextName);
-        
-        // bind the jetty http handler with the context handler        
-        context.setHandler(handler);
-        if (isSessionSupport) {            
+        // bind the jetty http handler with the context handler
+        if (isSessionSupport) {         
+            // If we have sessions, we need two handlers.
             HashSessionManager sessionManager = new HashSessionManager();
             SessionHandler sessionHandler = new SessionHandler(sessionManager);
             HashSessionIdManager idManager = new HashSessionIdManager();
-            sessionManager.setIdManager(idManager);            
-            context.addHandler(sessionHandler);           
+            sessionManager.setIdManager(idManager);
+            HandlerCollection hc = new HandlerCollection();
+            hc.addHandler(handler);
+            hc.addHandler(sessionHandler);
+            context.setHandler(hc);
+        } else {
+            // otherwise, just the one.
+            context.setHandler(handler);
         }
         contexts.addHandler(context);
         
@@ -405,6 +430,34 @@ public class JettyHTTPServerEngine
         ++servantCount;
     }
     
+    protected void setupThreadPool() {
+        AbstractConnector aconn = (AbstractConnector) connector;
+        if (isSetThreadingParameters()) {
+            ThreadPool pool = aconn.getThreadPool();
+            if (pool == null) {
+                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) {
+                QueuedThreadPool pl = (QueuedThreadPool)pool;
+                if (getThreadingParameters().isSetMinThreads()) {
+                    pl.setMinThreads(getThreadingParameters().getMinThreads());
+                }
+                if (getThreadingParameters().isSetMaxThreads()) {
+                    pl.setMaxThreads(getThreadingParameters().getMaxThreads());
+                }
+            }
+        }
+    }
+    
     private void setReuseAddress(Connector conn) throws IOException {
         if (conn instanceof AbstractConnector) {
             ((AbstractConnector)conn).setReuseAddress(isReuseAddress());

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java Mon Jul 26 01:43:35 2010
@@ -37,7 +37,7 @@ import org.apache.cxf.common.classloader
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.configuration.jsse.TLSServerParameters;
 import org.apache.cxf.management.InstrumentationManager;
-import org.mortbay.component.Container;
+import org.eclipse.jetty.util.component.Container;
 
 
 /**
@@ -290,7 +290,7 @@ public class JettyHTTPServerEngineFactor
             MBeanServer mbs =  bus.getExtension(InstrumentationManager.class).getMBeanServer();
             if (mbs != null) {
                 try {
-                    Class<?> cls = ClassLoaderUtils.loadClass("org.mortbay.management.MBeanContainer", 
+                    Class<?> cls = ClassLoaderUtils.loadClass("org.eclipse.jetty.jmx.MBeanContainer", 
                                                           getClass());
                     
                     mBeanContainer = (Container.Listener) cls.
@@ -300,7 +300,7 @@ public class JettyHTTPServerEngineFactor
                 } catch (Throwable ex) {
                     //ignore - just won't instrument jetty.  Probably don't have the
                     //jetty-management jar available
-                    LOG.info("Could not load or start org.mortbay.management.MBeanContainer.  "
+                    LOG.info("Could not load or start org.eclipse.management.MBeanContainer.  "
                              + "Jetty JMX support will not be enabled: " + ex.getMessage());
                 }
             }

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java Mon Jul 26 01:43:35 2010
@@ -21,7 +21,7 @@ package org.apache.cxf.transport.http_je
 
 import java.net.URL;
 
-import org.mortbay.jetty.Handler;
+import org.eclipse.jetty.server.Handler;
 
 public interface ServerEngine {
     /**

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationProvider.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationProvider.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationProvider.java Mon Jul 26 01:43:35 2010
@@ -20,6 +20,7 @@
 package org.apache.cxf.transport.http_jetty.continuations;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.continuations.Continuation;
 import org.apache.cxf.continuations.ContinuationProvider;
@@ -28,11 +29,15 @@ import org.apache.cxf.message.Message;
 public class JettyContinuationProvider implements ContinuationProvider {
 
     private HttpServletRequest request;
+    private HttpServletResponse response;
     private Message inMessage; 
     private JettyContinuationWrapper wrapper;
     
-    public JettyContinuationProvider(HttpServletRequest req, Message m) {
+    public JettyContinuationProvider(HttpServletRequest req,
+                                     HttpServletResponse resp, 
+                                     Message m) {
         request = req;
+        response = resp;
         this.inMessage = m;
     }
     public Continuation getContinuation() {
@@ -43,7 +48,7 @@ public class JettyContinuationProvider i
             return null;
         }
         if (wrapper == null && create) {
-            wrapper = new JettyContinuationWrapper(request, inMessage);
+            wrapper = new JettyContinuationWrapper(request, response, inMessage);
         }
         return wrapper;
     }

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java Mon Jul 26 01:43:35 2010
@@ -20,96 +20,75 @@
 package org.apache.cxf.transport.http_jetty.continuations;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.cxf.continuations.Continuation;
-import org.apache.cxf.continuations.ContinuationInfo;
-import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.message.Message;
-import org.mortbay.jetty.RetryRequest;
-import org.mortbay.util.ajax.ContinuationSupport;
-
-public class JettyContinuationWrapper implements Continuation {
-
-    private org.mortbay.util.ajax.Continuation continuation;
-    private Message message;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
+import org.eclipse.jetty.continuation.ContinuationListener;
+import org.eclipse.jetty.server.AsyncContext;
+import org.eclipse.jetty.server.Request;
+
+public class JettyContinuationWrapper implements Continuation, ContinuationListener {
+    boolean isNew;
+    boolean isResumed;
+    boolean isPending = true;
+    Object obj;
     
+    private Message message;
+    private AsyncContext context;
+    private final Request req;
     
-    public JettyContinuationWrapper(HttpServletRequest request, Message m) {
-        continuation = ContinuationSupport.getContinuation(request, null); 
+    public JettyContinuationWrapper(HttpServletRequest request, 
+                                    HttpServletResponse resp, 
+                                    Message m) {
+        req = (Request)request;
         message = m;
+        isNew = !req.isAsyncStarted();
+        if (isNew) {
+            req.setAttribute(AbstractHTTPDestination.CXF_CONTINUATION_MESSAGE,
+                             message.getExchange().getInMessage());
+            context = req.startAsync(req, resp);
+            context.addContinuationListener(this);
+        } else {
+            context = req.getAsyncContext();
+        }
     }
 
     public Object getObject() {
-        Object o = continuation.getObject();
-        if (o instanceof ContinuationInfo) {
-            return ((ContinuationInfo)o).getUserObject();
-        }
-        return o;
+        return obj;
+    }
+    public void setObject(Object userObject) {
+        obj = userObject;
+    }
+
+    public void resume() {
+        isResumed = true;
+        context.dispatch();
     }
 
     public boolean isNew() {
-        return continuation.isNew() || (!continuation.isPending() && !continuation.isResumed());
+        return isNew;
     }
 
     public boolean isPending() {
-        return continuation.isPending();
+        return isPending;
     }
 
     public boolean isResumed() {
-        return continuation.isResumed();
+        return isResumed;
     }
 
     public void reset() {
-        continuation.reset();
     }
 
-    public void resume() {
-        continuation.resume();
-    }
-
-    public void setObject(Object userObject) {
-        
-        ContinuationInfo ci = null;
-        Message m = message;
-        if (m != null && m.getExchange() != null && m.getExchange().getInMessage() != null) {
-            m = m.getExchange().getInMessage();
-        }
-        Object obj = continuation.getObject();
-        if (obj instanceof ContinuationInfo) {
-            ci = (ContinuationInfo)obj;
-        } else {
-            ci = new ContinuationInfo(m);
-            ci.setUserObject(obj);
-        }
-        if (message != userObject) {
-            ci.setUserObject(userObject);
-        }
-        continuation.setObject(ci);
-    }
 
     public boolean suspend(long timeout) {
-        
-        Object obj = continuation.getObject();
-        if (obj == null) {
-            continuation.setObject(new ContinuationInfo(message));
-        }
-        try {
-            return continuation.suspend(timeout);
-        } catch (RetryRequest ex) {
-            throw new SuspendedInvocationException(ex);
-        }
+        context.setTimeout(timeout);
+        isNew = false;
+        throw new org.apache.cxf.continuations.SuspendedInvocationException();
     }
     
-    public void done() {
-        ContinuationInfo ci = null;
-        Object obj = continuation.getObject();
-        if (obj instanceof ContinuationInfo) {
-            ci = (ContinuationInfo)obj;
-            continuation.setObject(ci.getUserObject());
-        }
-        continuation.reset();
-    }
-
     protected Message getMessage() {
         Message m = message;
         if (m != null && m.getExchange().getInMessage() != null) {
@@ -118,9 +97,14 @@ public class JettyContinuationWrapper im
         return m;
     }
     
-    public org.mortbay.util.ajax.Continuation getContinuation() {
-        return continuation;
+
+    public void onComplete(org.eclipse.jetty.continuation.Continuation continuation) {
+        getMessage().remove(AbstractHTTPDestination.CXF_CONTINUATION_MESSAGE);
+        isPending = false;
+    }
+
+    public void onTimeout(org.eclipse.jetty.continuation.Continuation continuation) {
+        context.dispatch();
     }
-    
     
 }

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java Mon Jul 26 01:43:35 2010
@@ -37,7 +37,7 @@ import org.apache.cxf.common.logging.Log
 import org.apache.cxf.configuration.security.ClientAuthentication;
 import org.apache.cxf.configuration.security.FiltersType;
 import org.apache.cxf.transport.https.SSLUtils;
-import org.mortbay.jetty.security.SslSocketConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
 
 /**
  * This class extends the Jetty SslSocketConnector, which allows

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java Mon Jul 26 01:43:35 2010
@@ -21,7 +21,7 @@ package org.apache.cxf.transport.https_j
 
 import org.apache.cxf.configuration.jsse.TLSServerParameters;
 import org.apache.cxf.transport.http_jetty.JettyConnectorFactory;
-import org.mortbay.jetty.AbstractConnector;
+import org.eclipse.jetty.server.AbstractConnector;
 
 /**
  * This class wraps the JettyConnectorFactory and will create 

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java Mon Jul 26 01:43:35 2010
@@ -21,11 +21,13 @@ package org.apache.cxf.transport.http_je
 
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+
+import org.eclipse.jetty.server.handler.ContextHandler;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.mortbay.jetty.handler.ContextHandler;
 
 public class JettyContextInspectorTest extends Assert {
     private static final String CONTEXT_PATH = "/foo/bar";

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java Mon Jul 26 01:43:35 2010
@@ -43,7 +43,6 @@ import org.apache.cxf.bus.CXFBusImpl;
 import org.apache.cxf.common.util.Base64Utility;
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.configuration.security.AuthorizationPolicy;
-import org.apache.cxf.continuations.ContinuationInfo;
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.endpoint.EndpointResolverRegistry;
 import org.apache.cxf.helpers.CastUtils;
@@ -59,6 +58,7 @@ import org.apache.cxf.transport.ConduitI
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.http.AbstractHTTPDestination;
 import org.apache.cxf.transports.http.QueryHandler;
 import org.apache.cxf.transports.http.QueryHandlerRegistry;
 import org.apache.cxf.transports.http.StemMatchingQueryHandler;
@@ -69,13 +69,12 @@ import org.apache.cxf.ws.addressing.JAXW
 import org.apache.cxf.ws.policy.PolicyEngine;
 import org.apache.cxf.wsdl.EndpointReferenceUtils;
 import org.easymock.classextension.EasyMock;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
-import org.mortbay.jetty.HttpFields;
-import org.mortbay.jetty.Request;
-import org.mortbay.jetty.Response;
-import org.mortbay.util.ajax.Continuation;
 
 public class JettyHTTPDestinationTest extends Assert {
     protected static final String AUTH_HEADER = "Authorization";
@@ -202,56 +201,11 @@ public class JettyHTTPDestinationTest ex
         }
     }
     
-    @Test
-    public void testRetrieveFromContinuation() throws Exception {
-        
-        Continuation continuation = EasyMock.createMock(Continuation.class);
-        
-        Message m = new MessageImpl();
-        ContinuationInfo ci = new ContinuationInfo(m);
-        Object userObject = new Object();
-        ci.setUserObject(userObject);
-        continuation.getObject();
-        EasyMock.expectLastCall().andReturn(ci);
-        continuation.setObject(ci.getUserObject());
-        EasyMock.expectLastCall();
-        EasyMock.replay(continuation);
-        
-        HttpServletRequest httpRequest = EasyMock.createMock(HttpServletRequest.class);
-        httpRequest.getAttribute("org.mortbay.jetty.ajax.Continuation");
-        EasyMock.expectLastCall().andReturn(continuation);
-        EasyMock.replay(httpRequest);
-        
-        ServiceInfo serviceInfo = new ServiceInfo();
-        serviceInfo.setName(new QName("bla", "Service"));
-        EndpointInfo ei = new EndpointInfo(serviceInfo, "");
-        ei.setName(new QName("bla", "Port"));
-        
-        transportFactory = new JettyHTTPTransportFactory();
-        transportFactory.setBus(new CXFBusImpl());
-        
-        TestJettyDestination testDestination = 
-            new TestJettyDestination(transportFactory.getBus(), 
-                                     transportFactory, ei);
-        testDestination.finalizeConfig();
-        Message mi = testDestination.retrieveFromContinuation(httpRequest);
-        assertSame("Message is lost", m, mi);
-        EasyMock.verify(continuation);
-        EasyMock.reset(httpRequest);
-        httpRequest.getAttribute("org.mortbay.jetty.ajax.Continuation");
-        EasyMock.expectLastCall().andReturn(null);
-        mi = testDestination.retrieveFromContinuation(httpRequest);
-        assertNotSame("New message expected", m, mi);
-    }
     
     @Test
     public void testContinuationsIgnored() throws Exception {
         
-        Continuation continuation = EasyMock.createMock(Continuation.class);
         HttpServletRequest httpRequest = EasyMock.createMock(HttpServletRequest.class);
-        httpRequest.getAttribute("org.mortbay.jetty.ajax.Continuation");
-        EasyMock.expectLastCall().andReturn(continuation);
-        EasyMock.replay(httpRequest);
         
         ServiceInfo serviceInfo = new ServiceInfo();
         serviceInfo.setName(new QName("bla", "Service"));
@@ -720,8 +674,9 @@ public class JettyHTTPDestinationTest ex
         request = EasyMock.createMock(Request.class);
         response = EasyMock.createMock(Response.class);
         request.getMethod();
-        EasyMock.expectLastCall().andReturn(method);
-        
+        EasyMock.expectLastCall().andReturn(method).atLeastOnce();
+        request.getConnection();
+        EasyMock.expectLastCall().andReturn(null).anyTimes();
         
         if (setRedirectURL) {
             policy.setRedirectURL(NOWHERE + "foo/bar");
@@ -739,7 +694,10 @@ public class JettyHTTPDestinationTest ex
             if ("GET".equals(method) && "?wsdl".equals(query)) {
                 verifyGetWSDLQuery();                
             } else { // test for the post
-                EasyMock.expect(request.getMethod()).andReturn(method);            
+                EasyMock.expect(request.getAttribute(AbstractHTTPDestination.CXF_CONTINUATION_MESSAGE))
+                    .andReturn(null);
+                
+                //EasyMock.expect(request.getMethod()).andReturn(method);            
                 EasyMock.expect(request.getInputStream()).andReturn(is);
                 EasyMock.expect(request.getContextPath()).andReturn("/bar");
                 EasyMock.expect(request.getPathInfo()).andReturn("/foo");
@@ -748,7 +706,7 @@ public class JettyHTTPDestinationTest ex
                 EasyMock.expect(request.getQueryString()).andReturn(query);    
                 EasyMock.expect(request.getHeader("Accept")).andReturn("*/*");  
                 EasyMock.expect(request.getContentType()).andReturn("text/xml charset=utf8").times(2);
-                EasyMock.expect(request.getAttribute("org.mortbay.jetty.ajax.Continuation")).andReturn(null);
+                EasyMock.expect(request.getAttribute("org.eclipse.jetty.ajax.Continuation")).andReturn(null);
                 
                 HttpFields httpFields = new HttpFields();
                 httpFields.add("content-type", "text/xml");

Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java Mon Jul 26 01:43:35 2010
@@ -42,14 +42,16 @@ import org.apache.cxf.helpers.IOUtils;
 import org.apache.cxf.management.InstrumentationManager;
 import org.easymock.classextension.EasyMock;
 import org.easymock.classextension.IMocksControl;
+
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.handler.ContextHandler;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.ContextHandler;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.security.SslSocketConnector;
 
 public class JettyHTTPServerEngineTest extends Assert {
 
@@ -183,7 +185,7 @@ public class JettyHTTPServerEngineTest e
         engine.addServant(new URL(urlStr2), handler2);
         
         Set<ObjectName>  s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
-            queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
+            queryNames(new ObjectName("org.eclipse.jetty.server:type=server,*"), null));
         assertEquals("Could not find 1 Jetty Server: " + s, 1, s.size());
         
         engine.removeServant(new URL(urlStr));
@@ -213,13 +215,13 @@ public class JettyHTTPServerEngineTest e
         engine.addServant(new URL(urlStr), handler1);
         
         Set<ObjectName>  s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
-            queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
+            queryNames(new ObjectName("org.eclipse.jetty.server:type=server,*"), null));
         assertEquals("Could not find 1 Jetty Server: " + s, 1, s.size());
         
         engine2.addServant(new URL(urlStr2), handler2);
         
         s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
-            queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
+            queryNames(new ObjectName("org.eclipse.jetty.server:type=server,*"), null));
         assertEquals("Could not find 2 Jetty Server: " + s, 2, s.size());
         
         engine.removeServant(new URL(urlStr));
@@ -229,13 +231,13 @@ public class JettyHTTPServerEngineTest e
         engine.shutdown();
         
         s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
-            queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
+            queryNames(new ObjectName("org.eclipse.jetty.server:type=server,*"), null));
         assertEquals("Could not find 2 Jetty Server: " + s, 1, s.size());
         
         engine2.shutdown();
         
         s = CastUtils.cast(ManagementFactory.getPlatformMBeanServer().
-            queryNames(new ObjectName("org.mortbay.jetty:type=server,*"), null));
+            queryNames(new ObjectName("org.eclipse.jetty.server:type=server,*"), null));
         assertEquals("Could not find 0 Jetty Server: " + s, 0, s.size());
         
         factory.destroyForPort(9234);
@@ -287,6 +289,7 @@ public class JettyHTTPServerEngineTest e
         //         transport.http_jetty:type=jettyhttptesthandler,id=0)
         // when running subsequent tests.
         contextHandler = engine.getContextHandler(new URL(urlStr));
+        contextHandler.stop();
         contextHandler.setHandler(handler2);
         contextHandler.start();
 



Mime
View raw message