You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/11/11 22:14:41 UTC
svn commit: r1846362 - in
/webservices/axiom/trunk/testing/spring-ws-testsuite: pom.xml
src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
Author: veithen
Date: Sun Nov 11 22:14:40 2018
New Revision: 1846362
URL: http://svn.apache.org/viewvc?rev=1846362&view=rev
Log:
Upgrade Jetty.
Modified:
webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml?rev=1846362&r1=1846361&r2=1846362&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Sun Nov 11 22:14:40 2018
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>8.2.0.v20160908</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>8.2.0.v20160908</version>
+ <version>9.4.12.v20180830</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java?rev=1846362&r1=1846361&r2=1846362&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java Sun Nov 11 22:14:40 2018
@@ -22,7 +22,7 @@ import org.apache.axiom.ts.soap.SOAPSpec
import org.apache.axiom.ts.springws.SpringWSTestCase;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -49,14 +49,12 @@ public abstract class ScenarioTestCase e
@Override
protected void setUp() throws Exception {
- server = new Server();
-
// Set up a custom thread pool to improve thread names (for logging purposes)
QueuedThreadPool threadPool = new QueuedThreadPool();
threadPool.setName("jetty");
- server.setThreadPool(threadPool);
+ server = new Server(threadPool);
- Connector connector = new SelectChannelConnector();
+ ServerConnector connector = new ServerConnector(server);
connector.setPort(0);
server.setConnectors(new Connector[] { connector });
ServletContextHandler handler = new ServletContextHandler(server, "/");