You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2025/11/19 04:38:43 UTC

(cxf) 01/01: Removing chunking keystore

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch coheigea/remove-keystore
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit e4b35b62bc92ab018d25f0c9905137783dc5344a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Nov 19 04:38:16 2025 +0000

    Removing chunking keystore
---
 .../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 16bc504694..dca8dd690e 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
@@ -103,13 +103,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));
@@ -134,14 +134,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 36f97615f9..cd7b3b115f 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
@@ -105,13 +105,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));
@@ -136,14 +136,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 7a5e409991..9cd3e89dee 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
@@ -85,12 +85,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