From 67b55ba670baba50f74b0acf92c7eb436b08bb26 Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Sat, 10 May 2025 14:42:06 +0100 Subject: [PATCH 1/2] Release version documentation and upgraded library versions. --- RELEASE-NOTES.md | 10 +++++----- Server/pom.xml | 2 +- changes.txt | 6 ++++++ pom.xml | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index b84da32d..809eaed0 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,20 +1,20 @@ # OpenAS2 Server -# Version 4.3.0 +# Version 4.4.0 # RELEASE NOTES ----- -The OpenAS2 project is pleased to announce the release of OpenAS2 4.3.0 +The OpenAS2 project is pleased to announce the release of OpenAS2 4.4.0 -The release download file is: OpenAS2Server-4.3.0.zip +The release download file is: OpenAS2Server-4.4.0.zip 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. -Version 4.3.0 - 2025-04-20 +Version 4.4.0 - 2025-05-10 This is an enhancement release. -1. Support retaining the original file name as received into the OpenAS2 server before processing so that it can be referenced in dynamic variables. +1. Log the file size of the file being processed in the AS2 vmessage builder. ##Upgrade Notes See the openAS2HowTo appendix for the general process on upgrading OpenAS2. diff --git a/Server/pom.xml b/Server/pom.xml index 04d5ae24..4892b12a 100644 --- a/Server/pom.xml +++ b/Server/pom.xml @@ -7,7 +7,7 @@ net.sf.openas2 OpenAS2 - 4.3.0 + 4.4.0 ../pom.xml diff --git a/changes.txt b/changes.txt index e9ab5c4b..f7c2e573 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,11 @@ **IMPORTANT NOTE**: Please review upgrade notes in the RELEASE-NOTES.md if you are upgrading +Version 4.4.0 - 2025-05-10 + +This is an enhancement release. + +1. Log the file size of the file being processed in the AS2 vmessage builder. + Version 4.3.0 - 2025-04-20 This is an enhancement release. diff --git a/pom.xml b/pom.xml index 75d5ecf9..d6826d48 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 net.sf.openas2 OpenAS2 - 4.3.0 + 4.4.0 OpenAS2 pom @@ -167,13 +167,13 @@ com.fasterxml.jackson.core jackson-databind - 2.18.3 + 2.19.0 jar com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.18.3 + 2.19.0 org.glassfish.jersey.media From fb6d3a9c2fb7c9abb64c3afe5ba31ab9bb87ecd1 Mon Sep 17 00:00:00 2001 From: Christopher Broderick Date: Sat, 10 May 2025 14:42:32 +0100 Subject: [PATCH 2/2] Log message on file size being processed. --- .../openas2/processor/receiver/MessageBuilderModule.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 e753d3a2..47034ed2 100644 --- a/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java +++ b/Server/src/main/java/org/openas2/processor/receiver/MessageBuilderModule.java @@ -83,7 +83,11 @@ protected Message processDocument(File fileToSend, String filename) throws OpenA if (fileSizeThresholdStr != null && fileSizeThresholdStr.length() > 0) { fileSizeThreshold = Long.parseLong(fileSizeThresholdStr); } - if (fileSizeThreshold > 0 && fileToSend.length() > fileSizeThreshold) { + long fileToSendLength = fileToSend.length(); + if (fileSizeThreshold > 0 && fileToSendLength > fileSizeThreshold) { + if (logger.isDebugEnabled()) { + logger.debug("File size threshold exceeded and file will be split into multiple files: " + filename); + } String newFileNamePrefix = msg.getPartnership().getAttribute(Partnership.PA_SPLIT_FILE_NAME_PREFIX); if (newFileNamePrefix == null) { newFileNamePrefix = ""; @@ -102,6 +106,7 @@ protected Message processDocument(File fileToSend, String filename) throws OpenA new Thread(fileSplitter).start(); return null; } else { + logger.info("Processing file for sending using AS2 - name: " + filename + " :: Size: " + fileToSendLength); addMessageMetadata(msg, filename); File pendingFile = new File(msg.getAttribute(FileAttribute.MA_PENDINGFILE)); try {