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/12 08:08:22 UTC
svn commit: r1846376 - in /webservices/axiom/branches/1.2.x: ./ testing/
testing/spring-ws-testsuite/pom.xml
testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
Author: veithen
Date: Mon Nov 12 08:08:22 2018
New Revision: 1846376
URL: http://svn.apache.org/viewvc?rev=1846376&view=rev
Log:
Merge r1846362 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 08:08:22 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843517,1845037,1845623
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1826041,1843069,1843517,1845037,1845623,1846362
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 08:08:22 2018
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735,1819411
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735,1819411,1846362
Modified: webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml?rev=1846376&r1=1846375&r2=1846376&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml Mon Nov 12 08:08:22 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/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java?rev=1846376&r1=1846375&r2=1846376&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java (original)
+++ webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/scenario/ScenarioTestCase.java Mon Nov 12 08:08:22 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, "/");