You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/07/26 03:43:38 UTC
svn commit: r979132 [2/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/...
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPTestHandler.java Mon Jul 26 01:43:35 2010
@@ -21,9 +21,12 @@ package org.apache.cxf.transport.http_je
import java.io.IOException;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.server.Request;
+
public class JettyHTTPTestHandler extends JettyHTTPHandler {
private boolean contextMatchExact;
private String response;
@@ -34,8 +37,11 @@ public class JettyHTTPTestHandler extend
response = s;
}
- public void handle(String target, HttpServletRequest req,
- HttpServletResponse resp, int dispatch) throws IOException {
+ @Override
+ public void handle(String target,
+ Request baseRequest,
+ HttpServletRequest request,
+ HttpServletResponse resp) throws IOException, ServletException {
if (contextMatchExact) {
// just return the response for testing
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/invalid-engines.xml Mon Jul 26 01:43:35 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.server.bio.SocketConnector">
<beans:property name = "port" value="1234" />
</beans:bean>
</httpj:connector>
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java Mon Jul 26 01:43:35 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.server.bio.SocketConnector",
+ engine.getConnector() instanceof org.eclipse.jetty.server.bio.SocketConnector);
JettyHTTPDestination jd3 =
(JettyHTTPDestination)factory.getDestination(
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml Mon Jul 26 01:43:35 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.server.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.server.handler.DefaultHandler"/>
</hj:handlers>
<hj:sessionSupport>true</hj:sessionSupport>
</hj:engine>
Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml (original)
+++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans.xml Mon Jul 26 01:43:35 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.server.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.server.handler.DefaultHandler"/>
</hj:handlers>
<hj:sessionSupport>true</hj:sessionSupport>
</hj:engine>
Modified: cxf/trunk/rt/transports/http-osgi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-osgi/pom.xml (original)
+++ cxf/trunk/rt/transports/http-osgi/pom.xml Mon Jul 26 01:43:35 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/trunk/rt/transports/http/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Mon Jul 26 01:43:35 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/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java Mon Jul 26 01:43:35 2010
@@ -40,6 +40,7 @@ import java.util.logging.Logger;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.namespace.QName;
@@ -52,6 +53,7 @@ import org.apache.cxf.common.util.Base64
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.Configurable;
import org.apache.cxf.configuration.security.AuthorizationPolicy;
+import org.apache.cxf.continuations.ContinuationProvider;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.HttpHeaderHelper;
import org.apache.cxf.interceptor.Fault;
@@ -80,8 +82,9 @@ import org.apache.cxf.wsdl.EndpointRefer
/**
* Common base for HTTP Destination implementations.
*/
-public abstract class AbstractHTTPDestination extends AbstractMultiplexDestination implements Configurable,
- Assertor {
+public abstract class AbstractHTTPDestination
+ extends AbstractMultiplexDestination
+ implements Configurable, Assertor {
public static final String HTTP_REQUEST = "HTTP.REQUEST";
public static final String HTTP_RESPONSE = "HTTP.RESPONSE";
@@ -91,7 +94,7 @@ public abstract class AbstractHTTPDestin
public static final String RESPONSE_COMMITED = "http.response.done";
public static final String REQUEST_REDIRECTED = "http.request.redirected";
-
+ public static final String CXF_CONTINUATION_MESSAGE = "cxf.continuation.message";
private static final Logger LOG = LogUtils.getL7dLogger(AbstractHTTPDestination.class);
private static final long serialVersionUID = 1L;
@@ -104,6 +107,7 @@ public abstract class AbstractHTTPDestin
protected boolean fixedParameterOrder;
protected boolean multiplexWithAddress;
protected CertConstraints certConstraints;
+ protected boolean isServlet3;
/**
* Constructor
@@ -121,6 +125,13 @@ public abstract class AbstractHTTPDestin
super(b, getTargetReference(getAddressValue(ei, dp), b), ei);
bus = b;
+ try {
+ ServletRequest.class.getMethod("isAsyncSupported");
+ isServlet3 = true;
+ } catch (Throwable t) {
+ //servlet 2.5 or earlier, no async support
+ }
+
initConfig();
}
@@ -271,7 +282,10 @@ public abstract class AbstractHTTPDestin
final ServletContext context,
final HttpServletRequest req,
final HttpServletResponse resp) throws IOException {
-
+ setupContinuation(inMessage,
+ req,
+ resp);
+
DelegatingInputStream in = new DelegatingInputStream(req.getInputStream());
inMessage.setContent(DelegatingInputStream.class, in);
inMessage.setContent(InputStream.class, in);
@@ -337,7 +351,26 @@ public abstract class AbstractHTTPDestin
Arrays.asList(new Interceptor[] {CertConstraintsInterceptor.INSTANCE}));
}
-
+ protected Message retrieveFromContinuation(HttpServletRequest req) {
+ if (!isServlet3) {
+ return null;
+ }
+ return retrieveFromServlet3Async(req);
+ }
+ protected Message retrieveFromServlet3Async(HttpServletRequest req) {
+ if (req.isAsyncStarted()) {
+ return (Message)req.getAttribute(CXF_CONTINUATION_MESSAGE);
+ }
+ return null;
+ }
+ protected void setupContinuation(Message inMessage,
+ final HttpServletRequest req,
+ final HttpServletResponse resp) {
+ if (isServlet3) {
+ inMessage.put(ContinuationProvider.class.getName(),
+ new Servlet3ContinuationProvider(req, resp, inMessage));
+ }
+ }
protected String getBasePath(String contextPath) throws IOException {
if (StringUtils.isEmpty(endpointInfo.getAddress())) {
return "";
@@ -470,6 +503,9 @@ public abstract class AbstractHTTPDestin
}
protected OutputStream flushHeaders(Message outMessage) throws IOException {
+ return flushHeaders(outMessage, true);
+ }
+ protected OutputStream flushHeaders(Message outMessage, boolean getStream) throws IOException {
if (isResponseRedirected(outMessage)) {
return null;
}
@@ -507,6 +543,8 @@ public abstract class AbstractHTTPDestin
response.setContentLength(0);
response.flushBuffer();
response.getOutputStream().close();
+ } else if (!getStream) {
+ response.getOutputStream().close();
} else {
responseStream = response.getOutputStream();
}
@@ -614,7 +652,7 @@ public abstract class AbstractHTTPDestin
*/
public void close() throws IOException {
if (wrappedStream == null) {
- OutputStream responseStream = flushHeaders(outMessage);
+ OutputStream responseStream = flushHeaders(outMessage, false);
if (null != responseStream) {
wrappedStream = responseStream;
}
Added: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java?rev=979132&view=auto
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java (added)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java Mon Jul 26 01:43:35 2010
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.transport.http;
+
+import java.io.IOException;
+
+import javax.servlet.AsyncContext;
+import javax.servlet.AsyncEvent;
+import javax.servlet.AsyncListener;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.cxf.continuations.Continuation;
+import org.apache.cxf.continuations.ContinuationProvider;
+import org.apache.cxf.message.Message;
+
+/**
+ *
+ */
+public class Servlet3ContinuationProvider implements ContinuationProvider {
+ HttpServletRequest req;
+ HttpServletResponse resp;
+ Message inMessage;
+
+ public Servlet3ContinuationProvider(HttpServletRequest req,
+ HttpServletResponse resp,
+ Message inMessage) {
+ this.inMessage = inMessage;
+ this.req = req;
+ this.resp = resp;
+ }
+
+ /** {@inheritDoc}*/
+ public Continuation getContinuation() {
+ if (inMessage.getExchange().isOneWay()) {
+ return null;
+ }
+
+ return new Servlet3Continuation();
+ }
+
+ public class Servlet3Continuation implements Continuation, AsyncListener {
+ AsyncContext context;
+ boolean isNew;
+ boolean isResumed;
+ boolean isPending = true;
+ Object obj;
+
+ public Servlet3Continuation() {
+ isNew = !req.isAsyncStarted();
+ if (isNew) {
+ req.setAttribute(AbstractHTTPDestination.CXF_CONTINUATION_MESSAGE,
+ inMessage.getExchange().getInMessage());
+ context = req.startAsync(req, resp);
+ context.addListener(this);
+ } else {
+ context = req.getAsyncContext();
+ }
+ }
+
+ public boolean suspend(long timeout) {
+ context.setTimeout(timeout);
+ isNew = false;
+ throw new org.apache.cxf.continuations.SuspendedInvocationException();
+ }
+ public void redispatch() {
+ context.dispatch();
+ }
+ public void resume() {
+ isResumed = true;
+ redispatch();
+ }
+
+ public void reset() {
+ }
+
+ public boolean isNew() {
+ return isNew;
+ }
+
+ public boolean isPending() {
+ return isPending;
+ }
+
+ public boolean isResumed() {
+ return isResumed;
+ }
+
+ public Object getObject() {
+ return obj;
+ }
+
+ public void setObject(Object o) {
+ obj = o;
+ }
+
+ public void onComplete(AsyncEvent event) throws IOException {
+ inMessage.getExchange().getInMessage()
+ .remove(AbstractHTTPDestination.CXF_CONTINUATION_MESSAGE);
+ isPending = false;
+ }
+ public void onError(AsyncEvent event) throws IOException {
+ }
+ public void onStartAsync(AsyncEvent event) throws IOException {
+ }
+ public void onTimeout(AsyncEvent event) throws IOException {
+ redispatch();
+ }
+
+ }
+}
Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: cxf/trunk/systests/container-integration/jetty6/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/container-integration/jetty6/pom.xml?rev=979132&view=auto
==============================================================================
--- cxf/trunk/systests/container-integration/jetty6/pom.xml (added)
+++ cxf/trunk/systests/container-integration/jetty6/pom.xml Mon Jul 26 01:43:35 2010
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-container-integration</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-ci-jetty6</artifactId>
+ <name>Apache CXF Container Integration Test Jetty6</name>
+ <version>2.3.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- disable surefire, all tests are failsafe -->
+ <excludes>
+ <exclude>**/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-war</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-ci-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <destFileName>hello.war</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/wars</outputDirectory>
+ <overWriteReleases>false</overWriteReleases>
+ <overWriteSnapshots>true</overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.5</version>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>verify</id>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.24</version>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <stopPort>8005</stopPort>
+ <stopKey>STOP</stopKey>
+ <contextPath>/</contextPath>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start-jetty</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run-war</goal>
+ </goals>
+ <configuration>
+ <webApp>${project.build.directory}/hello.war</webApp>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ <daemon>true</daemon>
+ </configuration>
+ </execution>
+ <execution>
+ <id>stop-jetty</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: cxf/trunk/systests/container-integration/jetty6/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/container-integration/jetty6/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/systests/container-integration/jetty6/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/systests/container-integration/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/container-integration/pom.xml?rev=979132&view=auto
==============================================================================
--- cxf/trunk/systests/container-integration/pom.xml (added)
+++ cxf/trunk/systests/container-integration/pom.xml Mon Jul 26 01:43:35 2010
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-container-integration</artifactId>
+ <name>Apache CXF Container Integration System Tests</name>
+ <version>2.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <url>http://cxf.apache.org</url>
+ <modules>
+ <module>webapp</module>
+ </modules>
+</project>
Propchange: cxf/trunk/systests/container-integration/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/container-integration/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/systests/container-integration/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/systests/container-integration/webapp/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/container-integration/webapp/pom.xml?rev=979132&view=auto
==============================================================================
--- cxf/trunk/systests/container-integration/webapp/pom.xml (added)
+++ cxf/trunk/systests/container-integration/webapp/pom.xml Mon Jul 26 01:43:35 2010
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-container-integration</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-ci-webapp</artifactId>
+ <name>Apache CXF Container Integration Test Webapp</name>
+ <version>2.3.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: cxf/trunk/systests/container-integration/webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/container-integration/webapp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/systests/container-integration/webapp/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java (from r978913, 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/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java?p2=cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java&p1=cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java&r1=978913&r2=979132&rev=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java (original)
+++ cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java Mon Jul 26 01:43:35 2010
@@ -16,18 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.transport.http_jetty;
+// START SNIPPET: service
+package demo.spring;
-import org.apache.cxf.endpoint.ContextInspector;
-import org.mortbay.jetty.handler.ContextHandler;
+import javax.jws.WebService;
-public class JettyContextInspector implements ContextInspector {
-
- public String getAddress(Object serverContext) {
- if (ContextHandler.class.isAssignableFrom(serverContext.getClass())) {
- return ((ContextHandler)serverContext).getContextPath();
- } else {
- return null;
- }
- }
+@WebService
+public interface HelloWorld {
+ String sayHi(String text);
}
+// END SNIPPET: service
Copied: cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java (from r978913, 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/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java?p2=cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java&p1=cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java&r1=978913&r2=979132&rev=979132&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextInspector.java (original)
+++ cxf/trunk/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java Mon Jul 26 01:43:35 2010
@@ -16,18 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.transport.http_jetty;
+// START SNIPPET: service
+package demo.spring;
-import org.apache.cxf.endpoint.ContextInspector;
-import org.mortbay.jetty.handler.ContextHandler;
+import javax.jws.WebService;
-public class JettyContextInspector implements ContextInspector {
-
- public String getAddress(Object serverContext) {
- if (ContextHandler.class.isAssignableFrom(serverContext.getClass())) {
- return ((ContextHandler)serverContext).getContextPath();
- } else {
- return null;
- }
+@WebService(endpointInterface = "demo.spring.HelloWorld")
+public class HelloWorldImpl implements HelloWorld {
+
+ public String sayHi(String text) {
+ System.out.println("sayHi called");
+ return "Hello " + text;
}
}
+// END SNIPPET: service
Added: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml?rev=979132&view=auto
==============================================================================
--- cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml (added)
+++ cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml Mon Jul 26 01:43:35 2010
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: beans -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <jaxws:endpoint
+ id="helloWorld"
+ implementor="demo.spring.HelloWorldImpl"
+ address="/HelloWorld" />
+
+</beans>
+<!-- END SNIPPET: beans -->
Propchange: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml?rev=979132&view=auto
==============================================================================
--- cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml (added)
+++ cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml Mon Jul 26 01:43:35 2010
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/beans.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <display-name>CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->
\ No newline at end of file
Propchange: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/systests/databinding/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/pom.xml (original)
+++ cxf/trunk/systests/databinding/pom.xml Mon Jul 26 01:43:35 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/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java (original)
+++ cxf/trunk/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractSpringServer.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AtomBookServer.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java Mon Jul 26 01:43:35 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/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Mon Jul 26 01:43:35 2010
@@ -538,7 +538,7 @@ public class BookStore {
@Produces("application/xml")
@Consumes("text/xml")
public Book addBookCustomFailure(Book book, @Context HttpServletResponse response) {
- response.setStatus(333);
+ response.setStatus(233);
response.addHeader("CustomHeader", "CustomValue");
book.setId(888);
return book;
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Mon Jul 26 01:43:35 2010
@@ -57,7 +57,7 @@ public class JAXRSClientServerBookTest e
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServer.class, true));
+ launchServer(BookServer.class, false));
}
@@ -741,7 +741,7 @@ public class JAXRSClientServerBookTest e
assertEquals(888L, book.getId());
Response r = client.getResponse();
assertEquals("CustomValue", r.getMetadata().getFirst("CustomHeader"));
- assertEquals(333, r.getStatus());
+ assertEquals(233, r.getStatus());
assertEquals("application/xml", r.getMetadata().getFirst("Content-Type"));
}
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapBookTest.java Mon Jul 26 01:43:35 2010
@@ -74,7 +74,7 @@ public class JAXRSSoapBookTest extends A
@BeforeClass
public static void startServers() throws Exception {
assertTrue("server did not launch correctly",
- launchServer(BookServerRestSoap.class));
+ launchServer(BookServerRestSoap.class, true));
}
@Test
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties Mon Jul 26 01:43:35 2010
@@ -20,6 +20,7 @@ org.apache.cxf.endpoint.level = OFF
org.apache.cxf.resource.level = OFF
org.springframework.level = OFF
org.mortbay.level = OFF
+org.eclipse.level = OFF
org.apache.axiom.level = OFF
org.apache.cxf.ws.policy.level = OFF
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties Mon Jul 26 01:43:35 2010
@@ -20,6 +20,7 @@ org.apache.cxf.endpoint.level = OFF
org.apache.cxf.resource.level = OFF
org.springframework.level = OFF
org.mortbay.level = OFF
+org.eclipse.level = OFF
org.apache.axiom.level = OFF
org.apache.cxf.ws.policy.level = OFF
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties Mon Jul 26 01:43:35 2010
@@ -20,6 +20,7 @@ org.apache.cxf.endpoint.level = OFF
org.apache.cxf.resource.level = OFF
org.springframework.level = OFF
org.mortbay.level = OFF
+org.eclipse.level = OFF
org.apache.axiom.level = OFF
# Atom handler specific settings
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties Mon Jul 26 01:43:35 2010
@@ -11,5 +11,6 @@ org.apache.cxf.endpoint.level = OFF
org.apache.cxf.resource.level = OFF
org.springframework.level = OFF
org.mortbay.level = OFF
+org.eclipse.level = OFF
org.apache.axiom.level = OFF
org.apache.cxf.ws.policy.level = OFF
Modified: cxf/trunk/systests/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/pom.xml (original)
+++ cxf/trunk/systests/jaxws/pom.xml Mon Jul 26 01:43:35 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/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerGreeterNoWsdlTest.java Mon Jul 26 01:43:35 2010
@@ -79,7 +79,7 @@ public class ClientServerGreeterNoWsdlTe
assertEquals(200, httpConnection.getResponseCode());
- assertEquals("text/xml; charset=utf-8", httpConnection.getContentType());
+ assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase());
assertEquals("OK", httpConnection.getResponseMessage());
InputStream in = httpConnection.getInputStream();
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java Mon Jul 26 01:43:35 2010
@@ -680,7 +680,7 @@ public class ClientServerTest extends Ab
BindingProvider bp = (BindingProvider)greeter;
Map<String, Object> responseContext = bp.getResponseContext();
String contentType = (String) responseContext.get(Message.CONTENT_TYPE);
- assertEquals("text/xml; charset=utf-8", contentType);
+ assertEquals("text/xml;charset=utf-8", contentType.toLowerCase());
Integer responseCode = (Integer) responseContext.get(Message.RESPONSE_CODE);
assertEquals(500, responseCode.intValue());
assertNotNull(brlf.getFaultInfo());
@@ -723,7 +723,7 @@ public class ClientServerTest extends Ab
assertEquals(200, httpConnection.getResponseCode());
- assertEquals("text/xml; charset=utf-8", httpConnection.getContentType());
+ assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase());
assertEquals("OK", httpConnection.getResponseMessage());
InputStream in = httpConnection.getInputStream();
@@ -753,7 +753,7 @@ public class ClientServerTest extends Ab
assertEquals(200, httpConnection.getResponseCode());
- assertEquals("text/xml; charset=utf-8", httpConnection.getContentType());
+ assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase());
assertEquals("OK", httpConnection.getResponseMessage());
InputStream in = httpConnection.getInputStream();
@@ -804,7 +804,7 @@ public class ClientServerTest extends Ab
assertEquals(200, httpConnection.getResponseCode());
- assertEquals("text/xml; charset=utf-8", httpConnection.getContentType());
+ assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase());
assertEquals("OK", httpConnection.getResponseMessage());
InputStream in = httpConnection.getInputStream();
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerXMLTest.java Mon Jul 26 01:43:35 2010
@@ -133,7 +133,7 @@ public class ClientServerXMLTest extends
assertEquals(200, httpConnection.getResponseCode());
- assertEquals("text/xml; charset=utf-8", httpConnection.getContentType());
+ assertEquals("text/xml;charset=utf-8", httpConnection.getContentType().toLowerCase());
assertEquals("OK", httpConnection.getResponseMessage());
InputStream in = httpConnection.getInputStream();
@@ -274,7 +274,7 @@ public class ClientServerXMLTest extends
BindingProvider bp = (BindingProvider) greeter;
Map<String, Object> responseContext = bp.getResponseContext();
String contentType = (String) responseContext.get(Message.CONTENT_TYPE);
- assertEquals("text/xml; charset=utf-8", contentType);
+ assertEquals("text/xml;charset=utf-8", contentType.toLowerCase());
Integer responseCode = (Integer) responseContext.get(Message.RESPONSE_CODE);
assertEquals(500, responseCode.intValue());
}
Modified: cxf/trunk/systests/transports/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/transports/pom.xml (original)
+++ cxf/trunk/systests/transports/pom.xml Mon Jul 26 01:43:35 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/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java Mon Jul 26 01:43:35 2010
@@ -42,14 +42,15 @@ import org.apache.cxf.io.CachedOutputStr
import org.apache.cxf.testutil.common.TestUtil;
import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
+
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.webapp.WebAppContext;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
-
-
import org.junit.Test;
-import org.mortbay.jetty.Handler;
-import org.mortbay.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 +176,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 +187,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/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java Mon Jul 26 01:43:35 2010
@@ -93,7 +93,7 @@ public class ClientServerWrappedContinua
CountDownLatch startSignal = new CountDownLatch(1);
CountDownLatch controlDoneSignal = new CountDownLatch(5);
CountDownLatch helloDoneSignal = new CountDownLatch(5);
-
+
executor.execute(new ControlWorker(helloPort, "Fred", startSignal, controlDoneSignal));
executor.execute(new HelloWorker(helloPort, "Fred", "", startSignal, helloDoneSignal));
@@ -111,8 +111,8 @@ public class ClientServerWrappedContinua
startSignal.countDown();
- controlDoneSignal.await(10, TimeUnit.SECONDS);
- helloDoneSignal.await(10, TimeUnit.SECONDS);
+ controlDoneSignal.await(100, TimeUnit.SECONDS);
+ helloDoneSignal.await(100, TimeUnit.SECONDS);
executor.shutdownNow();
assertEquals("Not all invocations have been resumed", 0, controlDoneSignal.getCount());
assertEquals("Not all invocations have completed", 0, helloDoneSignal.getCount());
Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml Mon Jul 26 01:43:35 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.server.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.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>
</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/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml Mon Jul 26 01:43:35 2010
@@ -26,7 +26,7 @@ http://www.springframework.org/schema/be
<http-jetty:engine-factory bus="cxf">
<http-jetty:engine port="0">
- <http-jetty:threadingParameters minThreads="1" maxThreads="3"/>
+ <http-jetty:threadingParameters minThreads="1" maxThreads="3"/>
</http-jetty:engine>
</http-jetty:engine-factory>
Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/servlet/NoSpringServletServer.java Mon Jul 26 01:43:35 2010
@@ -25,10 +25,10 @@ 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.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 +45,8 @@ 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/trunk/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/pom.xml?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/pom.xml (original)
+++ cxf/trunk/systests/uncategorized/pom.xml Mon Jul 26 01:43:35 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/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java?rev=979132&r1=979131&r2=979132&view=diff
==============================================================================
--- cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java (original)
+++ cxf/trunk/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java Mon Jul 26 01:43:35 2010
@@ -113,7 +113,7 @@ public class Soap12ClientServerTest exte
assertEquals(500, httpConnection.getResponseCode());
- assertEquals("Internal Server Error", httpConnection.getResponseMessage());
+ assertEquals("Server Error", httpConnection.getResponseMessage());
InputStream in = httpConnection.getErrorStream();
assertNotNull(in);
@@ -156,7 +156,7 @@ public class Soap12ClientServerTest exte
assertEquals("application/soap+xml; charset=utf-8", httpConnection.getContentType().toLowerCase());
- assertEquals("Internal Server Error", httpConnection.getResponseMessage());
+ assertEquals("Server Error", httpConnection.getResponseMessage());
InputStream in = httpConnection.getErrorStream();
assertNotNull(in);