You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2020/12/26 18:35:56 UTC
[axis-axis2-java-core] branch master updated: Use Jetty 9 in
axis2-testutils
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 91ec147 Use Jetty 9 in axis2-testutils
91ec147 is described below
commit 91ec147bc36cb5dd88cdb944ea8915fe4bab8c58
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sat Dec 26 18:35:34 2020 +0000
Use Jetty 9 in axis2-testutils
---
modules/testutils/pom.xml | 1 -
.../src/main/java/org/apache/axis2/testutils/JettyServer.java | 11 +++++------
.../java/org/apache/axis2/testutils/jaxws/JAXWSEndpoint.java | 8 +++-----
pom.xml | 6 ++++++
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/modules/testutils/pom.xml b/modules/testutils/pom.xml
index 8bba2eb..9da9cd2 100644
--- a/modules/testutils/pom.xml
+++ b/modules/testutils/pom.xml
@@ -46,7 +46,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>7.6.15.v20140411</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git a/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java b/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
index 52cd3a4..e06b24f 100644
--- a/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
+++ b/modules/testutils/src/main/java/org/apache/axis2/testutils/JettyServer.java
@@ -38,8 +38,7 @@ import javax.servlet.ServletException;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.eclipse.jetty.webapp.WebAppContext;
@@ -170,13 +169,13 @@ public class JettyServer extends AbstractAxis2Server {
server = new Server();
if (!secure) {
- SelectChannelConnector connector = new SelectChannelConnector();
+ ServerConnector connector = new ServerConnector(server);
server.addConnector(connector);
} else {
if (serverSslContextFactory == null) {
generateKeys();
}
- SslSelectChannelConnector sslConnector = new SslSelectChannelConnector(serverSslContextFactory);
+ ServerConnector sslConnector = new ServerConnector(server, serverSslContextFactory);
server.addConnector(sslConnector);
}
@@ -266,9 +265,9 @@ public class JettyServer extends AbstractAxis2Server {
}
for (Connector connector : connectors) {
- if (connector instanceof SelectChannelConnector) {
+ if (connector instanceof ServerConnector) {
//must be the http connector
- return connector.getLocalPort();
+ return ((ServerConnector) connector).getLocalPort();
}
}
diff --git a/modules/testutils/src/main/java/org/apache/axis2/testutils/jaxws/JAXWSEndpoint.java b/modules/testutils/src/main/java/org/apache/axis2/testutils/jaxws/JAXWSEndpoint.java
index 3ec8feb..b383973 100644
--- a/modules/testutils/src/main/java/org/apache/axis2/testutils/jaxws/JAXWSEndpoint.java
+++ b/modules/testutils/src/main/java/org/apache/axis2/testutils/jaxws/JAXWSEndpoint.java
@@ -22,8 +22,8 @@ import javax.xml.ws.Endpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.junit.rules.ExternalResource;
public final class JAXWSEndpoint extends ExternalResource {
@@ -38,9 +38,7 @@ public final class JAXWSEndpoint extends ExternalResource {
@Override
protected void before() throws Throwable {
- server = new Server();
- SelectChannelConnector connector = new SelectChannelConnector();
- server.addConnector(connector);
+ server = new Server(0);
HttpContextImpl httpContext = new HttpContextImpl();
Endpoint.create(implementor).publish(httpContext);
server.setHandler(new JAXWSHandler(httpContext));
@@ -60,6 +58,6 @@ public final class JAXWSEndpoint extends ExternalResource {
}
public String getAddress() {
- return String.format("http://localhost:%s/", server.getConnectors()[0].getLocalPort());
+ return server.getURI().toString();
}
}
diff --git a/pom.xml b/pom.xml
index 542beb8..169aa6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -515,6 +515,7 @@
<jaxb.api.version>2.3.1</jaxb.api.version>
<jaxbri.version>2.3.3</jaxbri.version>
<jettison.version>1.3.8</jettison.version>
+ <jetty.version>9.4.35.v20201120</jetty.version>
<jibx.version>1.3.3</jibx.version>
<log4j2.version>2.14.0</log4j2.version>
<maven.archiver.version>3.0.2</maven.archiver.version>
@@ -1096,6 +1097,11 @@
<artifactId>jetty</artifactId>
<version>5.1.10</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
<!-- AspectJ is used in the unit tests of several transports -->
<dependency>