From 07295119f7d85e7787bd123c26061cc6eb4ce9ef Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Fri, 27 Mar 2026 22:43:38 +0000 Subject: [PATCH 1/3] Fix generic poller payload filname issue --- RELEASE-NOTES.md | 37 +++++++------------ Server/pom.xml | 2 +- .../receiver/MessageBuilderModule.java | 4 +- changes.txt | 8 ++++ pom.xml | 34 +++++++++-------- 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 76af3b8b..411db4ba 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,42 +1,33 @@ # OpenAS2 Server +<<<<<<< HEAD +# Version 4.8.1 +# RELEASE NOTES +----- +The OpenAS2 project is pleased to announce the release of OpenAS2 4.8.1 + +The release download file is: OpenAS2Server-4.8.1.zip +======= # Version 4.8.0 # RELEASE NOTES ----- The OpenAS2 project is pleased to announce the release of OpenAS2 4.8.0 The release download file is: OpenAS2Server-4.8.0.zip +>>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f The zip file contains a PDF document (OpenAS2HowTo.pdf) providing information on installing and using the application. ## NOTE: Testing covers Java 11 to 21. ## Java 8 is NO LONGER SUPPORTED. +<<<<<<< HEAD +Version 4.8.1 - 2026-03-27 +======= Version 4.8.0 - 2025-10-31 +>>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f This is a minor bugfix release. +1. Correct payload filename when using generic directory poller. -1. Changes to partnership.xml - - * New optional attribute `quote_send_file_name` for the partnership to specify if - the filename which is to be included in header `Content-Disposition: Attachment; filename="filename.ext"` should be quoted or not. - Useful for target AS2 servers which are picky about the quotes. Requires `sendfilename="true"` to be set. - - Any value other than "false" will be considered true - default: true (previous behaviour). - ```` - - - - - - - - - - - - - - - ```` ## Upgrade Notes See the openAS2HowTo appendix for the general process on upgrading OpenAS2. diff --git a/Server/pom.xml b/Server/pom.xml index 280b7966..d84926ab 100644 --- a/Server/pom.xml +++ b/Server/pom.xml @@ -7,7 +7,7 @@ net.sf.openas2 OpenAS2 - 4.8.0 + 4.8.1 ../pom.xml diff --git a/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java b/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java index fcee1cd5..49abbeed 100644 --- a/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java +++ b/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java @@ -268,6 +268,7 @@ public Message buildBaseMessage(String filename) throws OpenAS2Exception { Message msg = createMessage(); MessageParameters params = new MessageParameters(msg); + msg.setAttribute(FileAttribute.MA_FILENAME, filename); // Capture the original file name in case config changes it msg.setAttribute("original_filename", filename); // Get the parameter that should provide the link between the polled directory @@ -289,12 +290,11 @@ public Message buildBaseMessage(String filename) throws OpenAS2Exception { // Should have sender/receiver now so update the message's partnership with any // stored information based on the identified partner IDs getSession().getPartnershipFactory().updatePartnership(msg, true); + msg.setPayloadFilename(msg.getAttribute(FileAttribute.MA_FILENAME)); return msg; } public void addMessageMetadata(Message msg, String filename) throws OpenAS2Exception { - msg.setAttribute(FileAttribute.MA_FILENAME, filename); - msg.setPayloadFilename(filename); // Set the filename extension if it has one msg.setAttribute(FileAttribute.MA_FILENAME_EXTENSION, FileUtil.getFilenameExtension(filename)); // Set a new message ID diff --git a/changes.txt b/changes.txt index 59d0a906..27b2e6ba 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,13 @@ **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading +<<<<<<< HEAD +Version 4.8.1 - 2026-03-27 + +This is a minor bugfix release. +1. Correct payload filename when using generic directory poller. + +======= +>>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f Version 4.8.0 - 2025-10-31 This is a minor enhancement release. diff --git a/pom.xml b/pom.xml index adcdd3ab..514db72b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,11 @@ 4.0.0 net.sf.openas2 OpenAS2 +<<<<<<< HEAD + 4.8.1 +======= 4.8.0 +>>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f OpenAS2 pom @@ -51,17 +55,17 @@ org.bouncycastle bcjmail-jdk18on - 1.82 + 1.83 org.bouncycastle bcpkix-jdk18on - 1.82 + 1.83 org.bouncycastle bcprov-jdk18on - 1.82 + 1.83 org.bouncycastle @@ -71,17 +75,17 @@ org.bouncycastle bcpg-jdk18on - 1.82 + 1.83 org.apache.commons commons-lang3 - 3.19.0 + 3.20.0 commons-cli commons-cli - 1.10.0 + 1.11.0 com.sun.mail @@ -116,14 +120,14 @@ org.mockito mockito-core - 5.20.0 + 5.23.0 test org.mockito mockito-junit-jupiter - 5.20.0 + 5.23.0 test @@ -136,7 +140,7 @@ commons-io commons-io - 2.20.0 + 2.21.0 org.slf4j @@ -146,7 +150,7 @@ ch.qos.logback logback-classic - 1.5.19 + 1.5.32 jakarta.ws.rs @@ -167,13 +171,13 @@ com.fasterxml.jackson.core jackson-databind - 2.20.0 + 2.21.2 jar com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.20.0 + 2.21.2 org.glassfish.jersey.media @@ -189,17 +193,17 @@ jakarta.xml.bind jakarta.xml.bind-api - 4.0.4 + 4.0.5 com.sun.xml.bind jaxb-core - 4.0.6 + 4.0.7 com.sun.xml.bind jaxb-impl - 4.0.6 + 4.0.7 com.zaxxer From 17809fc097b87cfeebb1138482fc93f0a2ec94fe Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Sun, 29 Mar 2026 11:23:05 +0100 Subject: [PATCH 2/3] Fix generic poller payload filname issue --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 514db72b..c4523e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,11 +5,7 @@ 4.0.0 net.sf.openas2 OpenAS2 -<<<<<<< HEAD 4.8.1 -======= - 4.8.0 ->>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f OpenAS2 pom From ca3476390ffca6677b440a346775977df93b7488 Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Sun, 29 Mar 2026 11:28:07 +0100 Subject: [PATCH 3/3] Fix generic poller payload filname issue --- RELEASE-NOTES.md | 12 ------------ changes.txt | 3 --- 2 files changed, 15 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 411db4ba..7beaf21f 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,29 +1,17 @@ # OpenAS2 Server -<<<<<<< HEAD # Version 4.8.1 # RELEASE NOTES ----- The OpenAS2 project is pleased to announce the release of OpenAS2 4.8.1 The release download file is: OpenAS2Server-4.8.1.zip -======= -# Version 4.8.0 -# RELEASE NOTES ------ -The OpenAS2 project is pleased to announce the release of OpenAS2 4.8.0 - -The release download file is: OpenAS2Server-4.8.0.zip ->>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f The zip file contains a PDF document (OpenAS2HowTo.pdf) providing information on installing and using the application. ## NOTE: Testing covers Java 11 to 21. ## Java 8 is NO LONGER SUPPORTED. -<<<<<<< HEAD Version 4.8.1 - 2026-03-27 ======= -Version 4.8.0 - 2025-10-31 ->>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f This is a minor bugfix release. 1. Correct payload filename when using generic directory poller. diff --git a/changes.txt b/changes.txt index 27b2e6ba..bf46cd68 100644 --- a/changes.txt +++ b/changes.txt @@ -1,13 +1,10 @@ **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading -<<<<<<< HEAD Version 4.8.1 - 2026-03-27 This is a minor bugfix release. 1. Correct payload filename when using generic directory poller. -======= ->>>>>>> c180d9bd1ca4d43f23a850541de20e86c3fda27f Version 4.8.0 - 2025-10-31 This is a minor enhancement release.