(axis-axis2-java-core) branch master updated (d277301b17 -> 9ebbf2f8eb)
This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
from d277301b17 Bump com.github.veithen.maven:hermetic-maven-plugin from
0.7.1 to 0.8.0
add 9ebbf2f8eb AXIS2-6051, replace httpclient4 with hittpclient5 and core5
No new revisions were added by this update.
Summary of changes:
modules/addressing/test-resources/axis2.xml| 2 +-
modules/fastinfoset/test-resources/axis2.xml | 4 +-
.../test-resources/SwA-enabled-axis2.xml | 2 +-
.../test-resources/SwA-fileCache-enabled-axis2.xml | 2 +-
.../deployment/deployment.both.axis2.xml | 4 +-
.../test-resources/deployment/server-transport.xml | 2 +-
.../test-resources/jaxrs/pojo-enabled-axis2.xml| 4 +-
.../test-resources/mtom/MTOM-enabled-axis2.xml | 2 +-
.../mtom/MTOM-fileCache-enabled-axis2.xml | 2 +-
.../test-resources/swa/SwA-enabled-axis2.xml | 2 +-
.../swa/SwA-fileCache-enabled-axis2.xml| 2 +-
.../org/apache/axis2/engine/EnginePausingTest.java | 4 +-
.../engine/EngineWithoutPhaseResolvingTest.java| 4 +-
.../axis2/engine/MessageContextSaveATest.java | 8 +-
.../axis2/engine/MessageContextSaveBTest.java | 8 +-
.../axis2/engine/MessageContextSaveCTest.java | 8 +-
.../engine/MessageContextSelfManagedDataTest.java | 8 +-
.../axis2/engine/OperationContextSaveTest.java | 4 +-
.../org/apache/axis2/engine/OptionsSaveTest.java | 8 +-
.../axis2/engine/chunking-disabled-axis2.xml | 4 +-
.../apache/axis2/engine/chunking-enabled-axis2.xml | 2 +-
.../axis2/engine/httpcomponents-enabled-axis2.xml | 2 +-
.../axis2/mtom/EchoRawMTOMFaultReportTest.java | 98 +++--
.../org/apache/axis2/rest/RESTfulServiceTest.java | 32 +-
.../jaxws/security/BasicAuthSecurityTests.java | 4 +-
modules/jaxws-integration/test-resources/axis2.xml | 4 +-
.../test-resources/axis2_addressing.xml| 4 +-
.../controller/impl/AxisInvocationController.java | 2 +-
.../axis2/jaxws/server/JAXWSMessageReceiver.java | 3 +-
modules/jaxws/test-resources/axis2.xml | 4 +-
.../test/org/apache/axis2/json/gson/UtilTest.java | 22 +-
.../test/org/apache/axis2/json/moshi/UtilTest.java | 24 +-
modules/kernel/conf/axis2.xml | 4 +-
.../org/apache/axis2/deployment/axis2_default.xml | 4 +-
.../org/apache/axis2/kernel/TransportUtils.java| 4 +-
.../axis2/kernel/http/SOAPMessageFormatter.java| 3 +
.../deployment/BadConfigOrderChange/axis2.xml | 2 +-
.../deployment/SystemPhaseRemove/axis2.xml | 2 +-
.../deployment/builderSelectorTest/axis2.xml | 4 +-
.../deployment/builderSelectorTest/bad-axis2.xml | 4 +-
.../deployment/hostConfigrepo/axis2.xml| 4 +-
.../deployment/messageFormatterTest/bad-axis2.xml | 4 +-
.../kernel/test-resources/deployment/server1.xml | 2 +-
.../org/apache/axis2/osgi/deployment/axis2.xml | 4 +-
modules/saaj/test-resources/saaj-repo/axis2.xml| 2 +-
.../java_first_jaxws/src/webapp/WEB-INF/axis2.xml | 4 +-
.../axis2/jaxws/interop/InteropSampleTest.java | 5 +
.../jaxws-samples/src/webapp/WEB-INF/axis2.xml | 4 +-
modules/samples/json/resources/axis2.xml | 4 +-
.../json/src/sample/json/client/JsonClient.java| 24 +-
.../httpsService/src/main/webapp/WEB-INF/axis2.xml | 4 +-
.../jmsService/src/main/resources/axis2.xml| 2 +-
modules/samples/userguide/conf/axis2.xml | 4 +-
.../springbootdemo/resources-axis2/conf/axis2.xml | 4 +-
.../samples/yahoojsonsearch/resources/axis2.xml| 4 +-
.../org/apache/axis2/testutils/Axis2Server.java| 3 +
modules/tool/axis2-aar-maven-plugin/pom.xml| 13 +-
.../org/apache/axis2/maven2/aar/DeployAarMojo.java | 52 ++-
modules/transport/http/pom.xml | 8 +-
.../http/AbstractHTTPTransportSender.java | 11 +-
.../apache/axis2/transport/http/AxisServlet.java | 3 +
.../apache/axis2/transport/http/HTTPSender.java| 33 +-
.../axis2/transport/http/HTTPTransportUtils.java | 9 +-
.../apache/axis2/transport/http/HTTPWorker.java| 15 +-
.../org/apache/axis2/transport/http/Request.java | 2 +-
.../axis2/transport/http/SimpleHTTPServer.java | 6 +-
.../AxisRequestEntityImpl.java | 35 +-
.../HTTPClient4TransportSender.java| 2 +-
.../HTTPClient5TransportSender.java} | 8 +-
.../HTTPProxyConfigurator.java | 50 +--
.../HTTPSenderImpl.java| 95 +++-
.../HttpTransportPropertiesImpl.java | 30 +-
.../{httpclient4 => httpclient5}/RequestImpl.java | 224 +-
.../transport/http/server/AxisHttpConnection.java | 20 +-
.../http/server/AxisHttpConnectionImpl.j
(axis-axis2-java-core) branch master updated: AXIS2-6051, minor code cleanup after commit to httpclient5
This is an automated email from the ASF dual-hosted git repository.
robertlazarski 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 ee96b0fe1e AXIS2-6051, minor code cleanup after commit to httpclient5
ee96b0fe1e is described below
commit ee96b0fe1e1cee069d4daf375bf66520a87500b1
Author: Robert Lazarski
AuthorDate: Wed May 29 06:53:15 2024 -1000
AXIS2-6051, minor code cleanup after commit to httpclient5
---
.../axis2/jaxws/server/JAXWSMessageReceiver.java | 3 ---
.../test/org/apache/axis2/json/gson/UtilTest.java | 8 +++
.../test/org/apache/axis2/json/moshi/UtilTest.java | 8 +++
.../org/apache/axis2/kernel/TransportUtils.java| 2 --
.../axis2/kernel/http/SOAPMessageFormatter.java| 3 ---
.../axis2/jaxws/interop/InteropSampleTest.java | 5 -
.../org/apache/axis2/maven2/aar/DeployAarMojo.java | 8 +++
.../http/AbstractHTTPTransportSender.java | 5 ++---
.../apache/axis2/transport/http/HTTPSender.java| 8 +++
.../httpclient5/HTTPClient5TransportSender.java| 2 +-
.../impl/httpclient5/HTTPProxyConfigurator.java| 1 -
.../http/impl/httpclient5/HTTPSenderImpl.java | 22 +--
.../http/server/AxisHttpConnectionImpl.java| 25 --
.../transport/http/server/AxisHttpRequestImpl.java | 8 +++
.../axis2/transport/http/HTTPSenderTest.java | 1 -
.../transport/testkit/http/JavaNetClient.java | 1 -
.../testkit/tests/async/AsyncMessageTestCase.java | 6 --
17 files changed, 47 insertions(+), 69 deletions(-)
diff --git
a/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
b/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
index e4facf2fd8..6bc742f482 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
@@ -234,9 +234,6 @@ public class JAXWSMessageReceiver implements
MessageReceiver {
ThreadContextMigratorUtil.performThreadCleanup(
Constants.THREAD_CONTEXT_MIGRATOR_LIST_ID,
axisRequestMsgCtx);
- // FIXME, comment out asap
-e.printStackTrace();
-
// TODO. This is throwing a client exception ?
// TODO Why are we preserving the stack information ?
diff --git a/modules/json/test/org/apache/axis2/json/gson/UtilTest.java
b/modules/json/test/org/apache/axis2/json/gson/UtilTest.java
index 06c9558f00..474cafdf1a 100644
--- a/modules/json/test/org/apache/axis2/json/gson/UtilTest.java
+++ b/modules/json/test/org/apache/axis2/json/gson/UtilTest.java
@@ -20,14 +20,14 @@
package org.apache.axis2.json.gson;
import org.apache.hc.client5.http.ClientProtocolException;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
import java.io.IOException;
diff --git a/modules/json/test/org/apache/axis2/json/moshi/UtilTest.java
b/modules/json/test/org/apache/axis2/json/moshi/UtilTest.java
index d918b98343..ff5d2a90e4 100644
--- a/modules/json/test/org/apache/axis2/json/moshi/UtilTest.java
+++ b/modules/json/test/org/apache/axis2/json/moshi/UtilTest.java
@@ -20,14 +20,14 @@
package org.apache.axis2.json.moshi;
import org.apache.hc.client5.http.ClientProtocolException;
-import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.classic.methods.HttpPost;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.io.entity.StringEntity;
-import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.apache.hc.core5.http.io.entity.StringEntity;
import java.io.IOException;
diff --git a/modules/kernel/src/org/apache/axis2/kernel/TransportUtils.java
b/modules/kernel/src/org/apache/axis2/kernel/TransportUtils.java
index 2eec7548f0..42452e0667 100644
--- a/modules/kernel/src/o
(axis-axis2-java-core) branch master updated: AXIS2-6051, more minor code cleanup after commit to httpclient5
This is an automated email from the ASF dual-hosted git repository.
robertlazarski 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 8f20f12107 AXIS2-6051, more minor code cleanup after commit to
httpclient5
8f20f12107 is described below
commit 8f20f121072cab1ad27b07bad3cd82eb29b972b9
Author: Robert Lazarski
AuthorDate: Wed May 29 07:07:56 2024 -1000
AXIS2-6051, more minor code cleanup after commit to httpclient5
---
.../apache/axis2/transport/http/server/AxisHttpConnectionImpl.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
index b574f7da10..231f569e7f 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
@@ -77,15 +77,12 @@ import java.net.Socket;
import java.net.SocketAddress;
import java.net.SocketException;
import java.net.SocketTimeoutException;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicReference;
import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSession;
-import java.util.UUID;
-
public class AxisHttpConnectionImpl implements AxisHttpConnection {
private static final Log HEADERLOG =
@@ -223,7 +220,6 @@ public class AxisHttpConnectionImpl implements
AxisHttpConnection {
// receiveRequestHeader() and receiveRequestEntity()
@Override
public ClassicHttpRequest receiveRequest() throws HttpException,
IOException {
-String uuid = UUID.randomUUID().toString();
// Prepare input stream
final SocketHolder socketHolder = ensureOpen();
this.in = socketHolder.getInputStream();
@@ -231,7 +227,7 @@ public class AxisHttpConnectionImpl implements
AxisHttpConnection {
this.inbuffer.clear();
final int i = this.inbuffer.readLine(headLine, this.in);
if (i == -1) {
-throw new IOException("readLine() from SessionInputBufferImpl
returned -1 in method receiveRequest() with uuid: " +uuid+ " ... at time: "
+LocalDateTime.now());
+throw new IOException("readLine() from SessionInputBufferImpl
returned -1 in method receiveRequest()");
}
final Header[] headers = AbstractMessageParser.parseHeaders(
(axis-axis2-java-core) branch master updated: AXIS2-6051, cleanup some imports and unused vars
This is an automated email from the ASF dual-hosted git repository.
robertlazarski 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 6c9c8c2a45 AXIS2-6051, cleanup some imports and unused vars
6c9c8c2a45 is described below
commit 6c9c8c2a4525e1ee7f4469aa75b391301339a6fd
Author: Robert Lazarski
AuthorDate: Wed May 29 09:24:03 2024 -1000
AXIS2-6051, cleanup some imports and unused vars
---
.../http/src/org/apache/axis2/transport/http/HTTPSender.java | 1 -
.../apache/axis2/transport/http/server/AxisHttpConnectionImpl.java | 2 +-
.../org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java | 5 -
.../src/org/apache/axis2/transport/http/server/AxisHttpService.java | 5 -
4 files changed, 1 insertion(+), 12 deletions(-)
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
index a60e18a2cf..7fdef01d5f 100644
--- a/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
+++ b/modules/transport/http/src/org/apache/axis2/transport/http/HTTPSender.java
@@ -42,7 +42,6 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hc.core5.http.HttpStatus;
import org.apache.hc.core5.http.HttpHeaders;
-import org.apache.hc.core5.util.Timeout;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
index 231f569e7f..a1bc7c22cc 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpConnectionImpl.java
@@ -252,7 +252,7 @@ public class AxisHttpConnectionImpl implements
AxisHttpConnection {
}
ProtocolVersion transportVersion = request.getVersion();
if (transportVersion != null &&
transportVersion.greaterEquals(HttpVersion.HTTP_2)) {
-HEADERLOG.warn("receiveRequestHeader() received http2 version: " +
transportVersion + " , however axis2 is configured for HTTP/1.1 and the
connection will be downgraded to HTTP/1.1");
+HEADERLOG.warn("receiveRequest() received http2 version: " +
transportVersion + " , however axis2 is configured for HTTP/1.1 and the
connection will be downgraded to HTTP/1.1");
// Downgrade protocol version if greater than HTTP/1.1
transportVersion = HttpVersion.HTTP_1_1;
}
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
index 74c4d4645a..11824c32c6 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpResponseImpl.java
@@ -19,18 +19,14 @@
package org.apache.axis2.transport.http.server;
-import org.apache.hc.client5.http.entity.EntityBuilder;
import org.apache.hc.core5.http.ClassicHttpResponse;
import org.apache.hc.core5.http.ContentType;
import org.apache.hc.core5.http.Header;
-import org.apache.hc.core5.http.HttpEntity;
import org.apache.hc.core5.http.HttpException;
import org.apache.hc.core5.http.ProtocolVersion;
import org.apache.hc.core5.http.ProtocolException;
-import org.apache.hc.core5.http.config.Http1Config;
import org.apache.hc.core5.http.io.entity.BasicHttpEntity;
import org.apache.hc.core5.http.io.entity.EmptyInputStream;
-import org.apache.hc.core5.http.message.BasicHeaderIterator;
import org.apache.hc.core5.http.protocol.HttpContext;
import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.apache.hc.core5.http.protocol.HttpProcessor;
@@ -39,7 +35,6 @@ import org.apache.axis2.kernel.OutTransportInfo;
import java.io.IOException;
import java.io.OutputStream;
-import java.time.LocalDateTime;
import java.util.Iterator;
public class AxisHttpResponseImpl implements AxisHttpResponse,
OutTransportInfo {
diff --git
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
index 6f10cdebbc..a3264acfcd 100644
---
a/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
+++
b/modules/transport/http/src/org/apache/axis2/transport/http/server/AxisHttpService.java
@@ -52,14 +52,12 @@ import
org.apache.hc.core5.http.impl.DefaultConnectionReuseStrategy;
import org.apache.hc.core5.http.impl.Http1StreamListener;
import org.apache.hc.core5.http.impl.ServerSupport;
import org.apache.hc.core5.http.imp
