This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new c144d16d6a Removing chunking keystore (#2738)
c144d16d6a is described below
commit c144d16d6abb244926915297066c401911aaffef
Author: Colm O hEigeartaigh <[email protected]>
AuthorDate: Wed Nov 19 06:20:54 2025 +0000
Removing chunking keystore (#2738)
(cherry picked from commit 4103ffb7ff0e15363ba92c90283d1cc7e76c69c8)
(cherry picked from commit 07270702454ca6b861b2d24ca208f88ae86f4056)
---
.../systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java | 8 ++++----
.../src/test/resources/keymanagers-chunking.jks | Bin 7121 -> 0 bytes
.../cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java | 8 ++++----
.../cxf/systest/jaxrs/JAXRSClientChunkingTest.java | 4 ++--
.../src/test/resources/keymanagers-chunking.jks | Bin 7121 -> 0 bytes
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java
b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java
index cade84e240..0c5501866d 100644
---
a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java
+++
b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/JAXRSAsyncClientChunkingTest.java
@@ -104,13 +104,13 @@ public class JAXRSAsyncClientChunkingTest extends
AbstractBusClientServerTestBas
config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
configureLogging(config);
- final String filename = "keymanagers-chunking.jks";
+ final String filename = "Morpit.jks";
try {
final MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Content-ID", filename);
headers.add("Content-Type", "application/binary");
headers.add("Content-Disposition", "attachment; filename=" +
chunked + "_" + autoRedirect + "_" + filename);
- final Attachment att = new
Attachment(getClass().getResourceAsStream("/" + filename), headers);
+ final Attachment att = new
Attachment(getClass().getResourceAsStream("/keys/" + filename), headers);
final MultipartBody entity = new MultipartBody(att);
try (Response response = webClient.header("Content-Type",
MediaType.MULTIPART_FORM_DATA).post(entity)) {
assertThat(response.getStatus(), equalTo(201));
@@ -135,14 +135,14 @@ public class JAXRSAsyncClientChunkingTest extends
AbstractBusClientServerTestBas
config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
configureLogging(config);
- final String filename = "keymanagers-chunking.jks";
+ final String filename = "Morpit.jks";
try {
final MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Content-ID", filename);
headers.add("Content-Type", "application/binary");
headers.add("Content-Disposition", "attachment; filename=" +
chunked
+ "_" + autoRedirect + "_async_" + filename);
- final Attachment att = new
Attachment(getClass().getResourceAsStream("/" + filename), headers);
+ final Attachment att = new
Attachment(getClass().getResourceAsStream("/keys/" + filename), headers);
final Entity<MultipartBody> entity = Entity.entity(new
MultipartBody(att),
MediaType.MULTIPART_FORM_DATA_TYPE);
try (Response response = webClient.header("Content-Type",
MediaType.MULTIPART_FORM_DATA).async()
diff --git a/systests/transport-hc5/src/test/resources/keymanagers-chunking.jks
b/systests/transport-hc5/src/test/resources/keymanagers-chunking.jks
deleted file mode 100644
index 60c35e992c..0000000000
Binary files
a/systests/transport-hc5/src/test/resources/keymanagers-chunking.jks and
/dev/null differ
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java
index 606838a1b7..00c39e9188 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientChunkingTest.java
@@ -106,13 +106,13 @@ public class JAXRSAsyncClientChunkingTest extends
AbstractBusClientServerTestBas
config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
configureLogging(config);
- final String filename = "keymanagers-chunking.jks";
+ final String filename = "Morpit.jks";
try {
final MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Content-ID", filename);
headers.add("Content-Type", "application/binary");
headers.add("Content-Disposition", "attachment; filename=" +
chunked + "_" + autoRedirect + "_" + filename);
- final Attachment att = new
Attachment(getClass().getResourceAsStream("/" + filename), headers);
+ final Attachment att = new
Attachment(getClass().getResourceAsStream("/keys/" + filename), headers);
final MultipartBody entity = new MultipartBody(att);
try (Response response = webClient.header("Content-Type",
MediaType.MULTIPART_FORM_DATA).post(entity)) {
assertThat(response.getStatus(), equalTo(201));
@@ -137,14 +137,14 @@ public class JAXRSAsyncClientChunkingTest extends
AbstractBusClientServerTestBas
config.getHttpConduit().getClient().setAutoRedirect(autoRedirect);
configureLogging(config);
- final String filename = "keymanagers-chunking.jks";
+ final String filename = "Morpit.jks";
try {
final MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Content-ID", filename);
headers.add("Content-Type", "application/binary");
headers.add("Content-Disposition", "attachment; filename=" +
chunked
+ "_" + autoRedirect + "_async_" + filename);
- final Attachment att = new
Attachment(getClass().getResourceAsStream("/" + filename), headers);
+ final Attachment att = new
Attachment(getClass().getResourceAsStream("/keys/" + filename), headers);
final Entity<MultipartBody> entity = Entity.entity(new
MultipartBody(att),
MediaType.MULTIPART_FORM_DATA_TYPE);
try (Response response = webClient.header("Content-Type",
MediaType.MULTIPART_FORM_DATA).async()
diff --git
a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
index b80d258dc6..aa58ebad46 100644
---
a/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
+++
b/systests/transports/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientChunkingTest.java
@@ -86,12 +86,12 @@ public class JAXRSClientChunkingTest extends
AbstractBusClientServerTestBase {
WebClient.getConfig(webClient).getHttpConduit().getClient().setAllowChunking(chunked);
try {
- final String filename = "keymanagers-chunking.jks";
+ final String filename = "Morpit.jks";
final MultivaluedMap<String, String> headers = new MetadataMap<>();
headers.add("Content-ID", filename);
headers.add("Content-Type", "application/binary");
headers.add("Content-Disposition", "attachment; filename=" +
chunked + "_" + filename);
- final Attachment att = new
Attachment(getClass().getResourceAsStream("/" + filename), headers);
+ final Attachment att = new
Attachment(getClass().getResourceAsStream("/keys/" + filename), headers);
final MultipartBody entity = new MultipartBody(att);
try (Response response = webClient.header("Content-Type",
"multipart/form-data").post(entity)) {
assertThat(response.getStatus(), equalTo(201));
diff --git a/systests/transports/src/test/resources/keymanagers-chunking.jks
b/systests/transports/src/test/resources/keymanagers-chunking.jks
deleted file mode 100644
index 60c35e992c..0000000000
Binary files a/systests/transports/src/test/resources/keymanagers-chunking.jks
and /dev/null differ
