cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bimargul...@apache.org
Subject svn commit: r965261 - in /cxf/branches/servlet3jetty7: integration/jca/src/main/java/org/apache/cxf/jca/cxf/ integration/jca/src/main/java/org/apache/cxf/jca/servant/ parent/ rt/frontend/jaxrs/ rt/frontend/jaxws/ rt/javascript/ rt/javascript/src/test/r...
Date Sun, 18 Jul 2010 16:55:02 GMT
Author: bimargulies
Date: Sun Jul 18 16:55:01 2010
New Revision: 965261

URL: http://svn.apache.org/viewvc?rev=965261&view=rev
Log:
CXF-2898: first pass of changes for sv3 and jetty7, only making changes that I'm confident of as I go

Modified:
    cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
    cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
    cxf/branches/servlet3jetty7/parent/pom.xml
    cxf/branches/servlet3jetty7/rt/frontend/jaxrs/pom.xml
    cxf/branches/servlet3jetty7/rt/frontend/jaxws/pom.xml
    cxf/branches/servlet3jetty7/rt/javascript/pom.xml
    cxf/branches/servlet3jetty7/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/pom.xml
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapperTest.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml
    cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
    cxf/branches/servlet3jetty7/rt/transports/http-osgi/pom.xml
    cxf/branches/servlet3jetty7/rt/transports/http/pom.xml
    cxf/branches/servlet3jetty7/systests/databinding/pom.xml
    cxf/branches/servlet3jetty7/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
    cxf/branches/servlet3jetty7/systests/jaxrs/pom.xml
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
    cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
    cxf/branches/servlet3jetty7/systests/jaxws/pom.xml
    cxf/branches/servlet3jetty7/systests/transports/pom.xml
    cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
    cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
    cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
    cxf/branches/servlet3jetty7/systests/uncategorized/pom.xml
    cxf/branches/servlet3jetty7/systests/ws-specs/pom.xml
    cxf/branches/servlet3jetty7/tools/wsdlto/test/pom.xml
    cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java

Modified: cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java (original)
+++ cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java Sun Jul 18 16:55:01 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.thread.ThreadPool;
 
 /**
  * The adapter for using Application Server's thread pool. 

Modified: cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java (original)
+++ cxf/branches/servlet3jetty7/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java Sun Jul 18 16:55:01 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/branches/servlet3jetty7/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/parent/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/parent/pom.xml (original)
+++ cxf/branches/servlet3jetty7/parent/pom.xml Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/frontend/jaxrs/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/servlet3jetty7/rt/frontend/jaxrs/pom.xml Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/frontend/jaxws/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/frontend/jaxws/pom.xml (original)
+++ cxf/branches/servlet3jetty7/rt/frontend/jaxws/pom.xml Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/javascript/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/javascript/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/javascript/pom.xml (original)
+++ cxf/branches/servlet3jetty7/rt/javascript/pom.xml Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml (original)
+++ cxf/branches/servlet3jetty7/rt/javascript/src/test/resources/XMLHttpRequestTestBeans.xml Sun Jul 18 16:55:01 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.handler.ContextHandler">
 					<property name="contextPath" value="/" />
 					<property name="handler">
-						<bean class="org.mortbay.jetty.handler.ResourceHandler">
+						<bean class="org.eclipse.jetty.handler.ResourceHandler">
 							<property name="baseResource">
-								<bean class="org.mortbay.resource.FileResource">
+								<bean class="org.eclipse.resource.FileResource">
 									<constructor-arg value="${staticResourceURL}" />
 								</bean>
 							</property>
 							<property name="mimeTypes">
-								<bean class="org.mortbay.jetty.MimeTypes">
+								<bean class="org.eclipse.jetty.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.handler.DefaultHandler" />
 			</httpj:handlers>
 		</httpj:engine>
 	</httpj:engine-factory>

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/pom.xml (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/pom.xml Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyConnectorFactory.java Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java Sun Jul 18 16:55:01 2010
@@ -51,10 +51,10 @@ import org.apache.cxf.transport.https.Ce
 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;
+import org.eclipse.jetty.continuation.Continuation;
+import org.eclipse.jetty.continuation.ContinuationSupport;
 
 public class JettyHTTPDestination extends AbstractHTTPDestination {
     

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Sun Jul 18 16:55:01 2010
@@ -38,21 +38,21 @@ 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.util.component.Container;
+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.HandlerList;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ssl.SslSocketConnector;
+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.util.thread.QueuedThreadPool;
 
 
 /**
@@ -339,9 +339,9 @@ public class JettyHTTPServerEngine
                
                 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 (aconn.getThreadPool() instanceof org.eclipse.thread.BoundedThreadPool) {
+                        org.eclipse.thread.BoundedThreadPool pool 
+                            = (org.eclipse.thread.BoundedThreadPool)aconn.getThreadPool();
                         if (getThreadingParameters().isSetMinThreads()) {
                             pool.setMinThreads(getThreadingParameters().getMinThreads());
                         }

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineFactory.java Sun Jul 18 16:55:01 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.management.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/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/ServerEngine.java Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java Sun Jul 18 16:55:01 2010
@@ -25,17 +25,17 @@ import org.apache.cxf.continuations.Cont
 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;
+import org.eclipse.jetty.RetryRequest;
+import org.eclipse.jetty.continuation.ContinuationSupport;
 
 public class JettyContinuationWrapper implements Continuation {
 
-    private org.mortbay.util.ajax.Continuation continuation;
+    private org.eclipse.jetty.continuation.Continuation continuation;
     private Message message;
     
     
     public JettyContinuationWrapper(HttpServletRequest request, Message m) {
-        continuation = ContinuationSupport.getContinuation(request, null); 
+        continuation = ContinuationSupport.getContinuation(request); 
         message = m;
     }
 
@@ -118,7 +118,7 @@ public class JettyContinuationWrapper im
         return m;
     }
     
-    public org.mortbay.util.ajax.Continuation getContinuation() {
+    public org.eclipse.jetty.continuation.Continuation getContinuation() {
         return continuation;
     }
     

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/CXFJettySslSocketConnector.java Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/https_jetty/JettySslConnectorFactory.java Sun Jul 18 16:55:01 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/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyContextInspectorTest.java Sun Jul 18 16:55:01 2010
@@ -25,7 +25,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.mortbay.jetty.handler.ContextHandler;
+import org.eclipse.jetty.server.handler.ContextHandler;
 
 public class JettyContextInspectorTest extends Assert {
     private static final String CONTEXT_PATH = "/foo/bar";

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestinationTest.java Sun Jul 18 16:55:01 2010
@@ -72,10 +72,10 @@ import org.easymock.classextension.EasyM
 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;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.continuation.Continuation;
 
 public class JettyHTTPDestinationTest extends Assert {
     protected static final String AUTH_HEADER = "Authorization";
@@ -218,7 +218,7 @@ public class JettyHTTPDestinationTest ex
         EasyMock.replay(continuation);
         
         HttpServletRequest httpRequest = EasyMock.createMock(HttpServletRequest.class);
-        httpRequest.getAttribute("org.mortbay.jetty.ajax.Continuation");
+        httpRequest.getAttribute("org.eclipse.jetty.ajax.Continuation");
         EasyMock.expectLastCall().andReturn(continuation);
         EasyMock.replay(httpRequest);
         
@@ -238,7 +238,7 @@ public class JettyHTTPDestinationTest ex
         assertSame("Message is lost", m, mi);
         EasyMock.verify(continuation);
         EasyMock.reset(httpRequest);
-        httpRequest.getAttribute("org.mortbay.jetty.ajax.Continuation");
+        httpRequest.getAttribute("org.eclipse.jetty.ajax.Continuation");
         EasyMock.expectLastCall().andReturn(null);
         mi = testDestination.retrieveFromContinuation(httpRequest);
         assertNotSame("New message expected", m, mi);
@@ -249,7 +249,7 @@ public class JettyHTTPDestinationTest ex
         
         Continuation continuation = EasyMock.createMock(Continuation.class);
         HttpServletRequest httpRequest = EasyMock.createMock(HttpServletRequest.class);
-        httpRequest.getAttribute("org.mortbay.jetty.ajax.Continuation");
+        httpRequest.getAttribute("org.eclipse.jetty.ajax.Continuation");
         EasyMock.expectLastCall().andReturn(continuation);
         EasyMock.replay(httpRequest);
         
@@ -748,7 +748,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/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java Sun Jul 18 16:55:01 2010
@@ -45,11 +45,11 @@ import org.easymock.classextension.IMock
 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;
+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;
 
 public class JettyHTTPServerEngineTest extends Assert {
 
@@ -183,7 +183,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:type=server,*"), null));
         assertEquals("Could not find 1 Jetty Server: " + s, 1, s.size());
         
         engine.removeServant(new URL(urlStr));
@@ -213,13 +213,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: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:type=server,*"), null));
         assertEquals("Could not find 2 Jetty Server: " + s, 2, s.size());
         
         engine.removeServant(new URL(urlStr));
@@ -229,13 +229,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: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:type=server,*"), null));
         assertEquals("Could not find 0 Jetty Server: " + s, 0, s.size());
         
         factory.destroyForPort(9234);

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapperTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapperTest.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapperTest.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapperTest.java Sun Jul 18 16:55:01 2010
@@ -27,7 +27,7 @@ import org.apache.cxf.message.MessageImp
 import org.easymock.classextension.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
-import org.mortbay.util.ajax.Continuation;
+import org.eclipse.jetty.continuation.Continuation;
 
 public class JettyContinuationWrapperTest extends Assert {
 
@@ -59,7 +59,7 @@ public class JettyContinuationWrapperTes
         EasyMock.replay(c);
         
         HttpServletRequest request = EasyMock.createMock(HttpServletRequest.class);
-        request.getAttribute("org.mortbay.jetty.ajax.Continuation");
+        request.getAttribute("org.eclipse.jetty.ajax.Continuation");
         EasyMock.expectLastCall().andReturn(c);
         EasyMock.replay(request);
         

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml Sun Jul 18 16:55:01 2010
@@ -40,7 +40,7 @@
 	         <sec:clientAuthentication want="true" required="true"/>
 	    </httpj:tlsServerParameters>
 	    <httpj:connector>
-	       <beans:bean class="org.mortbay.jetty.bio.SocketConnector">
+	       <beans:bean class="org.eclipse.jetty.bio.SocketConnector">
               <beans:property name = "port" value="1234" />
            </beans:bean>
 	    </httpj:connector> 

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java Sun Jul 18 16:55:01 2010
@@ -135,8 +135,8 @@ public class ApplicationContextTest exte
         assertTrue("The engine should support session manager", engine.isSessionSupport());
         assertNotNull("The handlers should not be null", engine.getHandlers());
         assertEquals(1, engine.getHandlers().size());
-        assertTrue("The connector should be instance of org.mortbay.jetty.bio.SocketConnector",
-                   engine.getConnector() instanceof org.mortbay.jetty.bio.SocketConnector);
+        assertTrue("The connector should be instance of org.eclipse.jetty.bio.SocketConnector",
+                   engine.getConnector() instanceof org.eclipse.jetty.server.bio.SocketConnector);
         
         JettyHTTPDestination jd3 = 
             (JettyHTTPDestination)factory.getDestination(

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml Sun Jul 18 16:55:01 2010
@@ -84,12 +84,12 @@
 	       <hj:threadingParameters minThreads="${engine.port.nine.one.minThreads}"
 	        maxThreads="${engine.port.nine.one.maxThreads}"/>	      
 	     <hj:connector>
-           <beans:bean class="org.mortbay.jetty.bio.SocketConnector">
+           <beans:bean class="org.eclipse.jetty.bio.SocketConnector">
               <beans:property name = "port" value="${engine.port.nine.one}" />
            </beans:bean>
          </hj:connector>
          <hj:handlers>
-           <beans:bean class="org.mortbay.jetty.handler.DefaultHandler"/>         
+           <beans:bean class="org.eclipse.jetty.handler.DefaultHandler"/>         
          </hj:handlers>
          <hj:sessionSupport>true</hj:sessionSupport>
 	  </hj:engine> 

Modified: cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml Sun Jul 18 16:55:01 2010
@@ -68,12 +68,12 @@
 	   <hj:engine port="9001">
 	       <hj:threadingParameters minThreads="99" maxThreads="777"/>	      
 	     <hj:connector>
-           <beans:bean class="org.mortbay.jetty.bio.SocketConnector">
+           <beans:bean class="org.eclipse.jetty.bio.SocketConnector">
               <beans:property name = "port" value="9001" />
            </beans:bean>
          </hj:connector>
          <hj:handlers>
-           <beans:bean class="org.mortbay.jetty.handler.DefaultHandler"/>         
+           <beans:bean class="org.eclipse.jetty.handler.DefaultHandler"/>         
          </hj:handlers>
          <hj:sessionSupport>true</hj:sessionSupport>
 	  </hj:engine> 

Modified: cxf/branches/servlet3jetty7/rt/transports/http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http-osgi/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http-osgi/pom.xml (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http-osgi/pom.xml Sun Jul 18 16:55:01 2010
@@ -56,8 +56,8 @@
             <version>${project.version}</version>
         </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>
 

Modified: cxf/branches/servlet3jetty7/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/rt/transports/http/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/rt/transports/http/pom.xml (original)
+++ cxf/branches/servlet3jetty7/rt/transports/http/pom.xml Sun Jul 18 16:55:01 2010
@@ -64,8 +64,8 @@
             <scope>test</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>

Modified: cxf/branches/servlet3jetty7/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/databinding/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/databinding/pom.xml (original)
+++ cxf/branches/servlet3jetty7/systests/databinding/pom.xml Sun Jul 18 16:55:01 2010
@@ -142,8 +142,8 @@
     </profiles>
     <dependencies>
         <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>
             <groupId>org.apache.cxf</groupId>
@@ -196,6 +196,14 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+       		<groupId>org.eclipse.jetty</groupId>
+       		<artifactId>jetty-server</artifactId>
+        </dependency>
+          <dependency>
+       		<groupId>org.eclipse.jetty</groupId>
+       		<artifactId>jetty-webapp</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/servlet3jetty7/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java (original)
+++ cxf/branches/servlet3jetty7/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.aegis;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class AegisServer extends AbstractBusTestServerBase {
     static final String PORT = allocatePort(AegisServer.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/pom.xml (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/pom.xml Sun Jul 18 16:55:01 2010
@@ -68,19 +68,22 @@
           <groupId>org.apache.ant</groupId>
           <artifactId>ant</artifactId>
         </dependency>
+         <dependency>
+       		<groupId>org.eclipse.jetty</groupId>
+       		<artifactId>jetty-server</artifactId>
+        </dependency>
+          <dependency>
+       		<groupId>org.eclipse.jetty</groupId>
+       		<artifactId>jetty-webapp</artifactId>
+        </dependency>
         <dependency>  
-           <groupId>jetty</groupId>  
-           <artifactId>jsp-api</artifactId> 
-           <version>2.1-6.0.2</version>
+           <groupId>org.eclipse.jetty</groupId>  
+           <artifactId>jetty-jsp-2.1</artifactId>
+           <version>${jetty.version}</version>
        </dependency>
-        <dependency>  
-           <groupId>jetty</groupId>  
-           <artifactId>jsp</artifactId> 
-           <version>2.1-6.0.2</version>
-       </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>
             <groupId>org.apache.cxf</groupId>
@@ -153,6 +156,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+        	<groupId>org.eclipse.jetty</groupId>
+        	<artifactId>jetty-server</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java Sun Jul 18 16:55:01 2010
@@ -23,17 +23,17 @@ import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 public abstract class AbstractSpringServer extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(AbstractSpringServer.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     private String resourcePath;
     private String contextPath;
     private int port;
@@ -58,7 +58,7 @@ public abstract class AbstractSpringServ
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(port);

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java Sun Jul 18 16:55:01 2010
@@ -22,21 +22,21 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
     
 public class AtomBookServer extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(AtomBookServer.class);
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookDataBindingServer extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookDataBindingServer.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookServerProxySpring extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServerProxySpring.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookServerRequestDispatch extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServerRequestDispatch.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookServerResourceCreatedSpring extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServerResourceCreatedSpring.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookServerResourceCreatedSpringProviders extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServerResourceCreatedSpringProviders.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookServerResourceJacksonSpringProviders extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServerResourceJacksonSpringProviders.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookServerRestSoap extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServerRestSoap.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java (original)
+++ cxf/branches/servlet3jetty7/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java Sun Jul 18 16:55:01 2010
@@ -22,23 +22,23 @@ package org.apache.cxf.systest.jaxrs;
 import java.net.URISyntaxException;
 
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.handler.DefaultHandler;
-import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.nio.SelectChannelConnector;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.server.Handler;
+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.webapp.WebAppContext;
 
 
 public class BookServerSpring extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(BookServerSpring.class);
 
-    private org.mortbay.jetty.Server server;
+    private org.eclipse.jetty.server.Server server;
     
     protected void run() {
         System.out.println("Starting Server");
 
-        server = new org.mortbay.jetty.Server();
+        server = new org.eclipse.jetty.server.Server();
 
         SelectChannelConnector connector = new SelectChannelConnector();
         connector.setPort(Integer.parseInt(PORT));

Modified: cxf/branches/servlet3jetty7/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/jaxws/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/jaxws/pom.xml (original)
+++ cxf/branches/servlet3jetty7/systests/jaxws/pom.xml Sun Jul 18 16:55:01 2010
@@ -84,8 +84,8 @@
     </profiles>
     <dependencies>
         <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>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: cxf/branches/servlet3jetty7/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/transports/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/transports/pom.xml (original)
+++ cxf/branches/servlet3jetty7/systests/transports/pom.xml Sun Jul 18 16:55:01 2010
@@ -107,8 +107,8 @@
     </profiles>
     <dependencies>
         <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>
             <groupId>org.apache.cxf</groupId>
@@ -167,6 +167,14 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+        	<groupId>org.eclipse.jetty</groupId>
+        	<artifactId>jetty-servlet</artifactId>
+        </dependency>
+        <dependency>
+        	<groupId>org.eclipse.jetty</groupId>
+        	<artifactId>jetty-webapp</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${project.version}</version>

Modified: cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java (original)
+++ cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java Sun Jul 18 16:55:01 2010
@@ -48,8 +48,8 @@ import org.junit.Before;
 
 
 import org.junit.Test;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.webapp.WebAppContext;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.webapp.WebAppContext;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.GenericApplicationContext;
@@ -175,7 +175,7 @@ public class EngineLifecycleTest extends
         ServerImpl si = (ServerImpl) sr.getServers().get(0);
         JettyHTTPDestination jhd = (JettyHTTPDestination) si.getDestination();
         JettyHTTPServerEngine e = (JettyHTTPServerEngine) jhd.getEngine();
-        org.mortbay.jetty.Server jettyServer = e.getServer();
+        org.eclipse.jetty.server.Server jettyServer = e.getServer();
 
         Handler[] contexts = jettyServer.getChildHandlersByClass(WebAppContext.class);
         WebAppContext servletContext = null;
@@ -186,7 +186,7 @@ public class EngineLifecycleTest extends
                 break;
             }
         }
-        servletContext.addServlet("org.mortbay.jetty.servlet.DefaultServlet", "/bloop");
+        servletContext.addServlet("org.eclipse.jetty.servlet.DefaultServlet", "/bloop");
         getTestHtml();
         invokeService();        
         shutdownService();

Modified: cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml (original)
+++ cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml Sun Jul 18 16:55:01 2010
@@ -37,30 +37,30 @@
  <httpj:engine-factory bus="cxf">
   <httpj:engine port='${testutil.ports.EngineLifecycleTest.1}'>
    <httpj:connector>
-    <bean class="org.mortbay.jetty.bio.SocketConnector">
+    <bean class="org.eclipse.jetty.bio.SocketConnector">
      <property name="port" value="${testutil.ports.EngineLifecycleTest.1}"/>
     </bean>
    </httpj:connector>
   </httpj:engine>
   <httpj:engine port="${testutil.ports.EngineLifecycleTest.2}">
    <httpj:handlers>
-    <bean class="org.mortbay.jetty.webapp.WebAppContext">
+    <bean class="org.eclipse.jetty.webapp.WebAppContext">
       <constructor-arg value="."/>
       <constructor-arg value="/jsunit"/>
     </bean>
-    <bean class="org.mortbay.jetty.handler.ContextHandler">
+    <bean class="org.eclipse.jetty.handler.ContextHandler">
      <property name="contextPath" value="/" />
      <property name="handler">
-      <bean class="org.mortbay.jetty.handler.ResourceHandler">
+      <bean class="org.eclipse.jetty.handler.ResourceHandler">
        <property name="baseResource">
-        <bean class="org.mortbay.resource.FileResource">
+        <bean class="org.eclipse.resource.FileResource">
          <constructor-arg value="${staticResourceURL}" />
         </bean>
         </property>
       </bean>
      </property>
     </bean>
-    <bean class="org.mortbay.jetty.handler.DefaultHandler"/>
+    <bean class="org.eclipse.jetty.handler.DefaultHandler"/>
    </httpj:handlers>
   </httpj:engine>
  </httpj:engine-factory>

Modified: cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java (original)
+++ cxf/branches/servlet3jetty7/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java Sun Jul 18 16:55:01 2010
@@ -25,10 +25,11 @@ import org.apache.cxf.BusFactory;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
 import org.apache.hello_world_soap_http.GreeterImpl;
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ContextHandlerCollection;
-import org.mortbay.jetty.servlet.Context;
-import org.mortbay.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ContextHandler.Context;
+import org.eclipse.jetty.server.handler.ContextHandlerCollection;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
 
 public class NoSpringServletServer extends AbstractBusTestServerBase {
     public static final String PORT = allocatePort(NoSpringServletServer.class);
@@ -45,7 +46,7 @@ public class NoSpringServletServer exten
             ContextHandlerCollection contexts = new ContextHandlerCollection();
             httpServer.setHandler(contexts);
 
-            Context root = new Context(contexts, "/", Context.SESSIONS);
+            ServletContextHandler root = new ServletContextHandler(contexts, "/", ServletContextHandler.SESSIONS);
 
             CXFNonSpringServlet cxf = new CXFNonSpringServlet();
             ServletHolder servlet = new ServletHolder(cxf);

Modified: cxf/branches/servlet3jetty7/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/uncategorized/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/uncategorized/pom.xml (original)
+++ cxf/branches/servlet3jetty7/systests/uncategorized/pom.xml Sun Jul 18 16:55:01 2010
@@ -112,8 +112,8 @@
     </profiles>
     <dependencies>
         <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>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/servlet3jetty7/systests/ws-specs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/ws-specs/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/systests/ws-specs/pom.xml (original)
+++ cxf/branches/servlet3jetty7/systests/ws-specs/pom.xml Sun Jul 18 16:55:01 2010
@@ -79,8 +79,8 @@
     </build>
     <dependencies>
         <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>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/branches/servlet3jetty7/tools/wsdlto/test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/tools/wsdlto/test/pom.xml?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/tools/wsdlto/test/pom.xml (original)
+++ cxf/branches/servlet3jetty7/tools/wsdlto/test/pom.xml Sun Jul 18 16:55:01 2010
@@ -75,14 +75,14 @@
           </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>
         <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>test</scope>
         </dependency>
 

Modified: cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=965261&r1=965260&r2=965261&view=diff
==============================================================================
--- cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/branches/servlet3jetty7/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Sun Jul 18 16:55:01 2010
@@ -45,8 +45,8 @@ import org.apache.cxf.wsdl11.WSDLRuntime
 
 import org.junit.Test;
 
-import org.mortbay.jetty.Server;
-import org.mortbay.jetty.handler.ResourceHandler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.ResourceHandler;
 
 
 public class CodeGenBugTest extends AbstractCodeGenTest {



Mime
View raw message