diff --git a/b6Middleware/.classpath b/b6Middleware/.classpath index fe01f2d..093adf4 100644 --- a/b6Middleware/.classpath +++ b/b6Middleware/.classpath @@ -29,16 +29,16 @@ - - - - + + + + diff --git a/b6Middleware/MANIFEST.MF b/b6Middleware/MANIFEST.MF index ac2c1ee..a4c43cd 100644 --- a/b6Middleware/MANIFEST.MF +++ b/b6Middleware/MANIFEST.MF @@ -2,9 +2,10 @@ Manifest-Version: 1.0 Main-Class: com.commander4j.mw.StartGUI Class-Path: lib/log/log4j-api-2.20.0.jar lib/log/log4j-core-2.20.0.jar - lib/mail/commons-email-1.5.jar - lib/mail/javax.activation-1.2.0.jar - lib/mail/javax.mail.jar + lib/mail/angus-activation-2.0.1.jar + lib/mail/angus-mail-2.0.2.jar + lib/mail/jakarta.activation-api-2.1.2.jar + lib/mail/jakarta.mail-api-2.1.2.jar lib/mqtt/org.eclipse.paho.client.mqttv3_1.2.3.jar lib/opencsv/lib/commons-beanutils-1.9.4.jar lib/opencsv/lib/commons-lang3-3.12.0.jar @@ -20,7 +21,6 @@ Class-Path: lib/log/log4j-api-2.20.0.jar lib/poi/ooxml-lib/commons-compress-1.21.jar lib/poi/ooxml-lib/commons-logging-1.2.jar lib/poi/ooxml-lib/curvesapi-1.07.jar - lib/poi/ooxml-lib/jakarta.activation-2.0.1.jar lib/poi/ooxml-lib/jakarta.xml.bind-api-3.0.1.jar lib/poi/ooxml-lib/xmlbeans-5.1.1.jar lib/poi/poi-5.2.3.jar diff --git a/b6Middleware/b6middleware.install4j b/b6Middleware/b6middleware.install4j index 3e75ce8..c081c22 100644 --- a/b6Middleware/b6middleware.install4j +++ b/b6Middleware/b6middleware.install4j @@ -1,7 +1,7 @@ - + diff --git a/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.class b/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.class index ea9241d..b97b0e3 100644 Binary files a/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.class and b/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/InboundConnectorABSTRACT.class differ diff --git a/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.class b/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.class index eeec6b4..2ac5c9f 100644 Binary files a/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.class and b/b6Middleware/bin/ABSTRACT/com/commander4j/Connector/OutboundConnectorABSTRACT.class differ diff --git a/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/InboundInterfaceABSTRACT.class b/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/InboundInterfaceABSTRACT.class index fe9c905..c114092 100644 Binary files a/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/InboundInterfaceABSTRACT.class and b/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/InboundInterfaceABSTRACT.class differ diff --git a/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/OutboundInterfaceABSTRACT.class b/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/OutboundInterfaceABSTRACT.class index ff7795e..1213b8c 100644 Binary files a/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/OutboundInterfaceABSTRACT.class and b/b6Middleware/bin/ABSTRACT/com/commander4j/Interface/OutboundInterfaceABSTRACT.class differ diff --git a/b6Middleware/bin/INTERFACE/com/commander4j/Connector/InboundConnectorINTERFACE.class b/b6Middleware/bin/INTERFACE/com/commander4j/Connector/InboundConnectorINTERFACE.class index 8a6d3fa..88eefd1 100644 Binary files a/b6Middleware/bin/INTERFACE/com/commander4j/Connector/InboundConnectorINTERFACE.class and b/b6Middleware/bin/INTERFACE/com/commander4j/Connector/InboundConnectorINTERFACE.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorASCII.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorASCII.class index 947f1f4..2794781 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorASCII.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorASCII.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorCSV.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorCSV.class index b663cb7..ff74638 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorCSV.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorCSV.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorEmail.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorEmail.class index 50e06e3..30b6bd3 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorEmail.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorEmail.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorExcel$1.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorExcel$1.class new file mode 100644 index 0000000..c89e690 Binary files /dev/null and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorExcel$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorExcel.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorExcel.class index 5d7113b..e1baa6a 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorExcel.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorExcel.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorIDOC.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorIDOC.class index d37ec1d..0d48581 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorIDOC.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorIDOC.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorPDF_PRINT.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorPDF_PRINT.class index 3e9fb69..365376d 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorPDF_PRINT.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorPDF_PRINT.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorRAW.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorRAW.class index 563ef2a..f21eb8d 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorRAW.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorRAW.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorXML.class b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorXML.class index 13a2418..942e4ea 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorXML.class and b/b6Middleware/bin/com/commander4j/Connector/Inbound/InboundConnectorXML.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorASCII.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorASCII.class index cbaa499..788d5e5 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorASCII.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorASCII.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorCSV.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorCSV.class index b0e4ab6..57eb25e 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorCSV.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorCSV.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorEmail.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorEmail.class index 5090845..6c9750d 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorEmail.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorEmail.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorExcel.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorExcel.class index 6dcbd0d..9a6b12f 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorExcel.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorExcel.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorIDOC.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorIDOC.class index 5c3931b..2c2b2a1 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorIDOC.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorIDOC.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorMQTT.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorMQTT.class index a10b9d4..f439cb3 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorMQTT.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorMQTT.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorPDF_PRINT.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorPDF_PRINT.class index f87fd16..f408a09 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorPDF_PRINT.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorPDF_PRINT.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorRAW.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorRAW.class index 48e82c0..1da8b8e 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorRAW.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorRAW.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorSOCKET.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorSOCKET.class index c72a773..709bfa4 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorSOCKET.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorSOCKET.class differ diff --git a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorXML.class b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorXML.class index b700bc5..fd4700c 100644 Binary files a/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorXML.class and b/b6Middleware/bin/com/commander4j/Connector/Outbound/OutboundConnectorXML.class differ diff --git a/b6Middleware/bin/com/commander4j/Interface/Inbound/InboundInterface.class b/b6Middleware/bin/com/commander4j/Interface/Inbound/InboundInterface.class index 187958a..2a9f0fc 100644 Binary files a/b6Middleware/bin/com/commander4j/Interface/Inbound/InboundInterface.class and b/b6Middleware/bin/com/commander4j/Interface/Inbound/InboundInterface.class differ diff --git a/b6Middleware/bin/com/commander4j/Interface/Mapping/Map.class b/b6Middleware/bin/com/commander4j/Interface/Mapping/Map.class index d8e75fd..4e7548e 100644 Binary files a/b6Middleware/bin/com/commander4j/Interface/Mapping/Map.class and b/b6Middleware/bin/com/commander4j/Interface/Mapping/Map.class differ diff --git a/b6Middleware/bin/com/commander4j/Interface/Mapping/Maps.class b/b6Middleware/bin/com/commander4j/Interface/Mapping/Maps.class index 1b29ced..9bc20b9 100644 Binary files a/b6Middleware/bin/com/commander4j/Interface/Mapping/Maps.class and b/b6Middleware/bin/com/commander4j/Interface/Mapping/Maps.class differ diff --git a/b6Middleware/bin/com/commander4j/Interface/Outbound/OutboundInterface.class b/b6Middleware/bin/com/commander4j/Interface/Outbound/OutboundInterface.class index c0bd7b5..0520978 100644 Binary files a/b6Middleware/bin/com/commander4j/Interface/Outbound/OutboundInterface.class and b/b6Middleware/bin/com/commander4j/Interface/Outbound/OutboundInterface.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY$1.class b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY$1.class index 1915233..35e626d 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY$1.class and b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY.class b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY.class index c6275c2..969e5f4 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY.class and b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DDMMYYYY.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS$1.class b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS$1.class index 4a02003..64135a6 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS$1.class and b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS.class b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS.class index d0e087d..56afe58 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS.class and b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_DD_MM_YYYY_HH_MM_SS.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY$1.class b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY$1.class index f31d6fd..47b344f 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY$1.class and b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY.class b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY.class index 77b1038..f55ccb1 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY.class and b/b6Middleware/bin/com/commander4j/Transformation/ISO_Date_to_date_MMYYYY.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/XSLT.class b/b6Middleware/bin/com/commander4j/Transformation/XSLT.class index 615b095..0ae9b85 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/XSLT.class and b/b6Middleware/bin/com/commander4j/Transformation/XSLT.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/concat$1.class b/b6Middleware/bin/com/commander4j/Transformation/concat$1.class index 8b5435d..93f1421 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/concat$1.class and b/b6Middleware/bin/com/commander4j/Transformation/concat$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/concat.class b/b6Middleware/bin/com/commander4j/Transformation/concat.class index c217e42..88608ec 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/concat.class and b/b6Middleware/bin/com/commander4j/Transformation/concat.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date$1.class b/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date$1.class index 92ca8ca..5b0a621 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date$1.class and b/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date.class b/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date.class index 2a197d3..03956bc 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date.class and b/b6Middleware/bin/com/commander4j/Transformation/date_DDMMYYYY_to_ISO_Date.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date$1.class b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date$1.class index 7890f58..9c65799 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date$1.class and b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date.class b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date.class index b6d6d13..3c24fbc 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date.class and b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MMM_YY_to_ISO_Date.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date$1.class b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date$1.class index 98a9989..a486d11 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date$1.class and b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date.class b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date.class index 368a534..1ac43c8 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date.class and b/b6Middleware/bin/com/commander4j/Transformation/date_DD_MM_YY_HH_MM_SS_to_ISO_Date.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/formatDate$1.class b/b6Middleware/bin/com/commander4j/Transformation/formatDate$1.class index c164513..d7594c5 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/formatDate$1.class and b/b6Middleware/bin/com/commander4j/Transformation/formatDate$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/formatDate.class b/b6Middleware/bin/com/commander4j/Transformation/formatDate.class index 12bac0f..c487ab2 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/formatDate.class and b/b6Middleware/bin/com/commander4j/Transformation/formatDate.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString$1.class b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString$1.class index 9eb36c9..c30a5a2 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString$1.class and b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString.class b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString.class index 7d1df4f..03ede7c 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString.class and b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeFilenameString.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString$1.class b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString$1.class index 1e1cb82..01504ac 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString$1.class and b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString.class b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString.class index 22f1213..3ff8894 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString.class and b/b6Middleware/bin/com/commander4j/Transformation/getISODateTimeString.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/nvl$1.class b/b6Middleware/bin/com/commander4j/Transformation/nvl$1.class index 7e4689f..2cc02c9 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/nvl$1.class and b/b6Middleware/bin/com/commander4j/Transformation/nvl$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/nvl.class b/b6Middleware/bin/com/commander4j/Transformation/nvl.class index f8b8b1c..7677325 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/nvl.class and b/b6Middleware/bin/com/commander4j/Transformation/nvl.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padEAN$1.class b/b6Middleware/bin/com/commander4j/Transformation/padEAN$1.class index 7e1b13d..baee33b 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padEAN$1.class and b/b6Middleware/bin/com/commander4j/Transformation/padEAN$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padEAN.class b/b6Middleware/bin/com/commander4j/Transformation/padEAN.class index 4aad058..4e1bb46 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padEAN.class and b/b6Middleware/bin/com/commander4j/Transformation/padEAN.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padStringLeft$1.class b/b6Middleware/bin/com/commander4j/Transformation/padStringLeft$1.class index ec102d0..a3cffb8 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padStringLeft$1.class and b/b6Middleware/bin/com/commander4j/Transformation/padStringLeft$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padStringLeft.class b/b6Middleware/bin/com/commander4j/Transformation/padStringLeft.class index 9337da8..122915e 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padStringLeft.class and b/b6Middleware/bin/com/commander4j/Transformation/padStringLeft.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padStringRight$1.class b/b6Middleware/bin/com/commander4j/Transformation/padStringRight$1.class index c2e562e..218e0fb 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padStringRight$1.class and b/b6Middleware/bin/com/commander4j/Transformation/padStringRight$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padStringRight.class b/b6Middleware/bin/com/commander4j/Transformation/padStringRight.class index 9a41a5f..557b65f 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padStringRight.class and b/b6Middleware/bin/com/commander4j/Transformation/padStringRight.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padVariant$1.class b/b6Middleware/bin/com/commander4j/Transformation/padVariant$1.class index f13eb69..70c9462 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padVariant$1.class and b/b6Middleware/bin/com/commander4j/Transformation/padVariant$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/padVariant.class b/b6Middleware/bin/com/commander4j/Transformation/padVariant.class index 1f5e68c..06ca06a 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/padVariant.class and b/b6Middleware/bin/com/commander4j/Transformation/padVariant.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/removeCommas$1.class b/b6Middleware/bin/com/commander4j/Transformation/removeCommas$1.class index 9048bdd..b2117d9 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/removeCommas$1.class and b/b6Middleware/bin/com/commander4j/Transformation/removeCommas$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/removeCommas.class b/b6Middleware/bin/com/commander4j/Transformation/removeCommas.class index 6f99387..b347495 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/removeCommas.class and b/b6Middleware/bin/com/commander4j/Transformation/removeCommas.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros$1.class b/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros$1.class index 5190e46..86ea20c 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros$1.class and b/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros.class b/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros.class index f2dac35..447f703 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros.class and b/b6Middleware/bin/com/commander4j/Transformation/removeLeadingZeros.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/removeSpaces$1.class b/b6Middleware/bin/com/commander4j/Transformation/removeSpaces$1.class index ac78c35..b976ad8 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/removeSpaces$1.class and b/b6Middleware/bin/com/commander4j/Transformation/removeSpaces$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/removeSpaces.class b/b6Middleware/bin/com/commander4j/Transformation/removeSpaces.class index c4d2365..07b0412 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/removeSpaces.class and b/b6Middleware/bin/com/commander4j/Transformation/removeSpaces.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/subString$1.class b/b6Middleware/bin/com/commander4j/Transformation/subString$1.class index 55cf6a8..33a5913 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/subString$1.class and b/b6Middleware/bin/com/commander4j/Transformation/subString$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/subString.class b/b6Middleware/bin/com/commander4j/Transformation/subString.class index 8f4d769..a52859c 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/subString.class and b/b6Middleware/bin/com/commander4j/Transformation/subString.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/trim$1.class b/b6Middleware/bin/com/commander4j/Transformation/trim$1.class index 0e1d38b..5ea1868 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/trim$1.class and b/b6Middleware/bin/com/commander4j/Transformation/trim$1.class differ diff --git a/b6Middleware/bin/com/commander4j/Transformation/trim.class b/b6Middleware/bin/com/commander4j/Transformation/trim.class index 7a81ac6..9bffea3 100644 Binary files a/b6Middleware/bin/com/commander4j/Transformation/trim.class and b/b6Middleware/bin/com/commander4j/Transformation/trim.class differ diff --git a/b6Middleware/bin/com/commander4j/email/Email.class b/b6Middleware/bin/com/commander4j/email/Email.class index ad4d408..258d889 100644 Binary files a/b6Middleware/bin/com/commander4j/email/Email.class and b/b6Middleware/bin/com/commander4j/email/Email.class differ diff --git a/b6Middleware/bin/com/commander4j/email/EmailQueue.class b/b6Middleware/bin/com/commander4j/email/EmailQueue.class index 0272d81..6eb3e9a 100644 Binary files a/b6Middleware/bin/com/commander4j/email/EmailQueue.class and b/b6Middleware/bin/com/commander4j/email/EmailQueue.class differ diff --git a/b6Middleware/bin/com/commander4j/email/SendEmail$1.class b/b6Middleware/bin/com/commander4j/email/SendEmail$1.class new file mode 100644 index 0000000..3a3bed2 Binary files /dev/null and b/b6Middleware/bin/com/commander4j/email/SendEmail$1.class differ diff --git a/b6Middleware/bin/com/commander4j/email/SendEmail.class b/b6Middleware/bin/com/commander4j/email/SendEmail.class index ac41416..ce9fe9e 100644 Binary files a/b6Middleware/bin/com/commander4j/email/SendEmail.class and b/b6Middleware/bin/com/commander4j/email/SendEmail.class differ diff --git a/b6Middleware/bin/com/commander4j/email/distributionList.class b/b6Middleware/bin/com/commander4j/email/distributionList.class index fcc33c9..2479dfa 100644 Binary files a/b6Middleware/bin/com/commander4j/email/distributionList.class and b/b6Middleware/bin/com/commander4j/email/distributionList.class differ diff --git a/b6Middleware/bin/com/commander4j/exception/OutboundPrinterQueueException.class b/b6Middleware/bin/com/commander4j/exception/OutboundPrinterQueueException.class index 5cfa7ff..811fef6 100644 Binary files a/b6Middleware/bin/com/commander4j/exception/OutboundPrinterQueueException.class and b/b6Middleware/bin/com/commander4j/exception/OutboundPrinterQueueException.class differ diff --git a/b6Middleware/bin/com/commander4j/gui/JList4j.class b/b6Middleware/bin/com/commander4j/gui/JList4j.class index 69092e1..eba4f77 100644 Binary files a/b6Middleware/bin/com/commander4j/gui/JList4j.class and b/b6Middleware/bin/com/commander4j/gui/JList4j.class differ diff --git a/b6Middleware/bin/com/commander4j/gui/JListData.class b/b6Middleware/bin/com/commander4j/gui/JListData.class index 59c639d..8885a32 100644 Binary files a/b6Middleware/bin/com/commander4j/gui/JListData.class and b/b6Middleware/bin/com/commander4j/gui/JListData.class differ diff --git a/b6Middleware/bin/com/commander4j/gui/JListRenderer.class b/b6Middleware/bin/com/commander4j/gui/JListRenderer.class index 4006316..42cfc89 100644 Binary files a/b6Middleware/bin/com/commander4j/gui/JListRenderer.class and b/b6Middleware/bin/com/commander4j/gui/JListRenderer.class differ diff --git a/b6Middleware/bin/com/commander4j/idoc/ConfigData.class b/b6Middleware/bin/com/commander4j/idoc/ConfigData.class index 5c989b5..131d427 100644 Binary files a/b6Middleware/bin/com/commander4j/idoc/ConfigData.class and b/b6Middleware/bin/com/commander4j/idoc/ConfigData.class differ diff --git a/b6Middleware/bin/com/commander4j/idoc/DataSegment.class b/b6Middleware/bin/com/commander4j/idoc/DataSegment.class index 895180c..5d179cf 100644 Binary files a/b6Middleware/bin/com/commander4j/idoc/DataSegment.class and b/b6Middleware/bin/com/commander4j/idoc/DataSegment.class differ diff --git a/b6Middleware/bin/com/commander4j/idoc/IdocParser.class b/b6Middleware/bin/com/commander4j/idoc/IdocParser.class index 48652de..0258eb4 100644 Binary files a/b6Middleware/bin/com/commander4j/idoc/IdocParser.class and b/b6Middleware/bin/com/commander4j/idoc/IdocParser.class differ diff --git a/b6Middleware/bin/com/commander4j/idoc/OutputData.class b/b6Middleware/bin/com/commander4j/idoc/OutputData.class index 56e04be..6085a43 100644 Binary files a/b6Middleware/bin/com/commander4j/idoc/OutputData.class and b/b6Middleware/bin/com/commander4j/idoc/OutputData.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartGUI$1.class b/b6Middleware/bin/com/commander4j/mw/StartGUI$1.class index 918107d..b5f01cb 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartGUI$1.class and b/b6Middleware/bin/com/commander4j/mw/StartGUI$1.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartGUI$2.class b/b6Middleware/bin/com/commander4j/mw/StartGUI$2.class index 1f47d63..f1148ae 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartGUI$2.class and b/b6Middleware/bin/com/commander4j/mw/StartGUI$2.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartGUI$3.class b/b6Middleware/bin/com/commander4j/mw/StartGUI$3.class index ef858b7..884c27a 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartGUI$3.class and b/b6Middleware/bin/com/commander4j/mw/StartGUI$3.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartGUI$4.class b/b6Middleware/bin/com/commander4j/mw/StartGUI$4.class index 962660e..da91a9b 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartGUI$4.class and b/b6Middleware/bin/com/commander4j/mw/StartGUI$4.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartGUI$5.class b/b6Middleware/bin/com/commander4j/mw/StartGUI$5.class index 9e078d8..3c23d04 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartGUI$5.class and b/b6Middleware/bin/com/commander4j/mw/StartGUI$5.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartGUI$WindowListener.class b/b6Middleware/bin/com/commander4j/mw/StartGUI$WindowListener.class index 3d607a8..41477ad 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartGUI$WindowListener.class and b/b6Middleware/bin/com/commander4j/mw/StartGUI$WindowListener.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartGUI.class b/b6Middleware/bin/com/commander4j/mw/StartGUI.class index 06c16d9..6f4a826 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartGUI.class and b/b6Middleware/bin/com/commander4j/mw/StartGUI.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartMain.class b/b6Middleware/bin/com/commander4j/mw/StartMain.class index 3b641a6..e1f35ab 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartMain.class and b/b6Middleware/bin/com/commander4j/mw/StartMain.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample$1.class b/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample$1.class index 5421aea..18d59b4 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample$1.class and b/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample$1.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample.class b/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample.class index be0a2ff..3cb6c7d 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample.class and b/b6Middleware/bin/com/commander4j/mw/StartService$AddShutdownHookSample.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartService.class b/b6Middleware/bin/com/commander4j/mw/StartService.class index 5a5c722..9e562b1 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartService.class and b/b6Middleware/bin/com/commander4j/mw/StartService.class differ diff --git a/b6Middleware/bin/com/commander4j/mw/StartTest.class b/b6Middleware/bin/com/commander4j/mw/StartTest.class index a968b06..3154d21 100644 Binary files a/b6Middleware/bin/com/commander4j/mw/StartTest.class and b/b6Middleware/bin/com/commander4j/mw/StartTest.class differ diff --git a/b6Middleware/bin/com/commander4j/sys/Common.class b/b6Middleware/bin/com/commander4j/sys/Common.class index 63ec5ff..fb4576c 100644 Binary files a/b6Middleware/bin/com/commander4j/sys/Common.class and b/b6Middleware/bin/com/commander4j/sys/Common.class differ diff --git a/b6Middleware/bin/com/commander4j/sys/FixedASCIIColumns.class b/b6Middleware/bin/com/commander4j/sys/FixedASCIIColumns.class index 33e282b..1063ce3 100644 Binary files a/b6Middleware/bin/com/commander4j/sys/FixedASCIIColumns.class and b/b6Middleware/bin/com/commander4j/sys/FixedASCIIColumns.class differ diff --git a/b6Middleware/bin/com/commander4j/sys/FixedASCIIData.class b/b6Middleware/bin/com/commander4j/sys/FixedASCIIData.class index 0593a9c..ba35531 100644 Binary files a/b6Middleware/bin/com/commander4j/sys/FixedASCIIData.class and b/b6Middleware/bin/com/commander4j/sys/FixedASCIIData.class differ diff --git a/b6Middleware/bin/com/commander4j/sys/MiddlewareConfig.class b/b6Middleware/bin/com/commander4j/sys/MiddlewareConfig.class index 9570940..bec903a 100644 Binary files a/b6Middleware/bin/com/commander4j/sys/MiddlewareConfig.class and b/b6Middleware/bin/com/commander4j/sys/MiddlewareConfig.class differ diff --git a/b6Middleware/bin/com/commander4j/thread/EmailThread.class b/b6Middleware/bin/com/commander4j/thread/EmailThread.class index 3d59ffe..f5579ae 100644 Binary files a/b6Middleware/bin/com/commander4j/thread/EmailThread.class and b/b6Middleware/bin/com/commander4j/thread/EmailThread.class differ diff --git a/b6Middleware/bin/com/commander4j/thread/LogArchiveThread.class b/b6Middleware/bin/com/commander4j/thread/LogArchiveThread.class index f802d6a..edf153c 100644 Binary files a/b6Middleware/bin/com/commander4j/thread/LogArchiveThread.class and b/b6Middleware/bin/com/commander4j/thread/LogArchiveThread.class differ diff --git a/b6Middleware/bin/com/commander4j/thread/StatusThread.class b/b6Middleware/bin/com/commander4j/thread/StatusThread.class index 7101cc7..6ad190a 100644 Binary files a/b6Middleware/bin/com/commander4j/thread/StatusThread.class and b/b6Middleware/bin/com/commander4j/thread/StatusThread.class differ diff --git a/b6Middleware/bin/com/commander4j/util/JArchive.class b/b6Middleware/bin/com/commander4j/util/JArchive.class index 068e314..6c8ccde 100644 Binary files a/b6Middleware/bin/com/commander4j/util/JArchive.class and b/b6Middleware/bin/com/commander4j/util/JArchive.class differ diff --git a/b6Middleware/bin/com/commander4j/util/JFileIO.class b/b6Middleware/bin/com/commander4j/util/JFileIO.class index 26878c1..d6f8b54 100644 Binary files a/b6Middleware/bin/com/commander4j/util/JFileIO.class and b/b6Middleware/bin/com/commander4j/util/JFileIO.class differ diff --git a/b6Middleware/bin/com/commander4j/util/JFileLock.class b/b6Middleware/bin/com/commander4j/util/JFileLock.class index 57fb3dc..279ce5c 100644 Binary files a/b6Middleware/bin/com/commander4j/util/JFileLock.class and b/b6Middleware/bin/com/commander4j/util/JFileLock.class differ diff --git a/b6Middleware/bin/com/commander4j/util/JImageIconLoader.class b/b6Middleware/bin/com/commander4j/util/JImageIconLoader.class index de80466..1f62d43 100644 Binary files a/b6Middleware/bin/com/commander4j/util/JImageIconLoader.class and b/b6Middleware/bin/com/commander4j/util/JImageIconLoader.class differ diff --git a/b6Middleware/bin/com/commander4j/util/JWait.class b/b6Middleware/bin/com/commander4j/util/JWait.class index 284ab8f..edbbc1d 100644 Binary files a/b6Middleware/bin/com/commander4j/util/JWait.class and b/b6Middleware/bin/com/commander4j/util/JWait.class differ diff --git a/b6Middleware/bin/com/commander4j/util/JXMLDocument.class b/b6Middleware/bin/com/commander4j/util/JXMLDocument.class index 6c0f6fb..1b29e18 100644 Binary files a/b6Middleware/bin/com/commander4j/util/JXMLDocument.class and b/b6Middleware/bin/com/commander4j/util/JXMLDocument.class differ diff --git a/b6Middleware/bin/com/commander4j/util/Utility.class b/b6Middleware/bin/com/commander4j/util/Utility.class index 4140875..31e7749 100644 Binary files a/b6Middleware/bin/com/commander4j/util/Utility.class and b/b6Middleware/bin/com/commander4j/util/Utility.class differ diff --git a/b6Middleware/build.xml b/b6Middleware/build.xml index 9cbed39..cc6d7a1 100644 --- a/b6Middleware/build.xml +++ b/b6Middleware/build.xml @@ -3,12 +3,12 @@ Any modifications will be overwritten. To include a user specific buildfile here, simply create one in the same directory with the processing instruction - as the first entry and export the buildfile again. --> + as the first entry and export the buildfile again. --> - + @@ -32,20 +32,20 @@ - - - - + + + + - + @@ -68,23 +68,22 @@ - - - - + + + + - @@ -99,7 +98,7 @@ - + @@ -108,9 +107,4 @@ - - - - - diff --git a/b6Middleware/c4jMiddleware.jar b/b6Middleware/c4jMiddleware.jar index b3d720d..bd12f95 100644 Binary files a/b6Middleware/c4jMiddleware.jar and b/b6Middleware/c4jMiddleware.jar differ diff --git a/b6Middleware/lib/mail/angus-activation-2.0.1.jar b/b6Middleware/lib/mail/angus-activation-2.0.1.jar new file mode 100644 index 0000000..9d56221 Binary files /dev/null and b/b6Middleware/lib/mail/angus-activation-2.0.1.jar differ diff --git a/b6Middleware/lib/mail/angus-mail-2.0.2.jar b/b6Middleware/lib/mail/angus-mail-2.0.2.jar new file mode 100644 index 0000000..b1f03cd Binary files /dev/null and b/b6Middleware/lib/mail/angus-mail-2.0.2.jar differ diff --git a/b6Middleware/lib/mail/commons-email-1.5.jar b/b6Middleware/lib/mail/commons-email-1.5.jar deleted file mode 100644 index 291bd19..0000000 Binary files a/b6Middleware/lib/mail/commons-email-1.5.jar and /dev/null differ diff --git a/b6Middleware/lib/mail/jakarta.activation-api-2.1.2.jar b/b6Middleware/lib/mail/jakarta.activation-api-2.1.2.jar new file mode 100644 index 0000000..ea57b3e Binary files /dev/null and b/b6Middleware/lib/mail/jakarta.activation-api-2.1.2.jar differ diff --git a/b6Middleware/lib/mail/jakarta.mail-api-2.1.2.jar b/b6Middleware/lib/mail/jakarta.mail-api-2.1.2.jar new file mode 100644 index 0000000..98362f6 Binary files /dev/null and b/b6Middleware/lib/mail/jakarta.mail-api-2.1.2.jar differ diff --git a/b6Middleware/lib/mail/javax.activation-1.2.0.jar b/b6Middleware/lib/mail/javax.activation-1.2.0.jar deleted file mode 100644 index 9637479..0000000 Binary files a/b6Middleware/lib/mail/javax.activation-1.2.0.jar and /dev/null differ diff --git a/b6Middleware/lib/mail/javax.mail.jar b/b6Middleware/lib/mail/javax.mail.jar deleted file mode 100644 index ab4d021..0000000 Binary files a/b6Middleware/lib/mail/javax.mail.jar and /dev/null differ diff --git a/b6Middleware/lib/poi/ooxml-lib/jakarta.activation-2.0.1.jar b/b6Middleware/lib/poi/ooxml-lib/jakarta.activation-2.0.1.jar deleted file mode 100644 index 521c7c4..0000000 Binary files a/b6Middleware/lib/poi/ooxml-lib/jakarta.activation-2.0.1.jar and /dev/null differ diff --git a/b6Middleware/src/com/commander4j/email/SendEmail.java b/b6Middleware/src/com/commander4j/email/SendEmail.java index 5cea3e2..38aead1 100644 --- a/b6Middleware/src/com/commander4j/email/SendEmail.java +++ b/b6Middleware/src/com/commander4j/email/SendEmail.java @@ -5,15 +5,23 @@ import java.util.HashMap; import java.util.Properties; -import org.apache.commons.mail.DefaultAuthenticator; -import org.apache.commons.mail.EmailAttachment; -import org.apache.commons.mail.MultiPartEmail; import org.apache.logging.log4j.Logger; import com.commander4j.sys.Common; import com.commander4j.util.JXMLDocument; import com.commander4j.util.Utility; +import jakarta.mail.Authenticator; +import jakarta.mail.Message; +import jakarta.mail.PasswordAuthentication; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.Multipart; + public class SendEmail { Logger logger = org.apache.logging.log4j.LogManager.getLogger((SendEmail.class)); @@ -89,126 +97,123 @@ public synchronized boolean Send(String distributionID, String subject, String m if (distList.get(distributionID).enabled.equals("Y")) { - String emailKey = "[" + distributionID + "] - [" + subject + "]"; - logger.debug(emailKey); + String emailKey = "[" + distributionID + "] - [" + subject + "]"; + logger.debug(emailKey); - Calendar lastSent; - Calendar now = Calendar.getInstance(); - - Boolean okToSend = false; + Calendar lastSent = Calendar.getInstance(); + Calendar now = Calendar.getInstance(); - if (emailLog.containsKey(emailKey)) - { - lastSent = emailLog.get(emailKey); - } - else - { - okToSend = true; - lastSent = now; - emailLog.put(emailKey, lastSent); - } + if (emailLog.containsKey(emailKey)) + { + lastSent = emailLog.get(emailKey); + } + else + { + lastSent.add(Calendar.DATE, -1); + emailLog.put(emailKey, lastSent); + } - - long seconds = (now.getTimeInMillis() - lastSent.getTimeInMillis()) / 1000; - - long ageInMins = seconds/60; - - logger.debug("Last email to " + emailKey + " was at " + util.getISODateStringFromCalendar(lastSent)); - logger.debug("Current time is " + util.getISODateStringFromCalendar(now)); - - logger.debug("Minutes since last email to " + emailKey + " is " + String.valueOf(ageInMins)); - - if (ageInMins >= distList.get(distributionID).maxFrequencyMins) - { - okToSend = true; - emailLog.put(emailKey, now); - logger.debug("Email allowed"); - } - else - { - //okToSend = false; - logger.debug("Email suppressed - too frequent"); - } + long seconds = (now.getTimeInMillis() - lastSent.getTimeInMillis()) / 1000; - if (okToSend) - { - EmailAttachment attachment = new EmailAttachment(); - MultiPartEmail email = new MultiPartEmail(); - try - { - if (smtpProperties.get("mail.smtp.auth").toString().toLowerCase().equals("true")) - { - logger.debug("Email authentication required"); - email.setAuthenticator(new DefaultAuthenticator(smtpProperties.get("mail.smtp.user").toString(), smtpProperties.get("mail.smtp.password").toString())); - email.setStartTLSEnabled(true); - } - else - { - logger.debug("Email No Authentication specified"); - } + long ageInMins = seconds / 60; + + logger.debug("Last email to " + emailKey + " was at " + util.getISODateStringFromCalendar(lastSent)); + logger.debug("Current time is " + util.getISODateStringFromCalendar(now)); - email.getMailSession().getProperties().putAll(smtpProperties); + logger.debug("Minutes since last email to " + emailKey + " is " + String.valueOf(ageInMins)); - String emails = distList.get(distributionID).addressList; - String[] emailArray = emails.split(","); - emails = null; + if (ageInMins >= distList.get(distributionID).maxFrequencyMins) + { - if (emailArray.length > 0) + emailLog.put(emailKey, now); + logger.debug("Email frequency permitted."); + + try { - for (int x = 0; x < emailArray.length; x++) + Properties propAuth = new Properties(); + Properties propNoAuth = new Properties(); + + propAuth.putAll(smtpProperties); + propNoAuth.putAll(smtpProperties); + + Session authenticatedSession = Session.getInstance(propAuth, new Authenticator() { - email.addTo(emailArray[x].toLowerCase(), ""); - logger.debug("Email To: " + emailArray[x].toLowerCase()); - } + @Override + protected PasswordAuthentication getPasswordAuthentication() + { + return new PasswordAuthentication(smtpProperties.get("mail.smtp.user").toString(), smtpProperties.get("mail.smtp.password").toString()); + } + }); - emailArray = null; + propNoAuth.put("mail.smtp.user",""); + propNoAuth.put("mail.smtp.password",""); + - try + Session unauthenticatedSession = Session.getInstance(propAuth,null); + + MimeMessage message; + + if (smtpProperties.get("mail.smtp.auth").toString().toLowerCase().equals("true")) + { + logger.debug("Email authentication required"); + message = new MimeMessage(authenticatedSession); + } + else { + logger.debug("Email no authentication required"); + message = new MimeMessage(unauthenticatedSession); + } - email.setFrom(smtpProperties.get("mail.smtp.from").toString(), ""); - email.setSubject(subject); - email.setMsg(messageText); + String emails = distList.get(distributionID).addressList; - // add the attachment - if (filename.equals("") == false) - { - logger.debug("Email add attachment [" + util.getFilenameFromPath(filename) + "]"); + logger.debug("Email To: " + emails); + message.addRecipients(Message.RecipientType.TO, InternetAddress.parse(emails)); - attachment.setPath(filename); - attachment.setDisposition(EmailAttachment.ATTACHMENT); - attachment.setDescription(filename); - attachment.setName(util.getFilenameFromPath(filename)); - email.attach(attachment); - } + message.setFrom(new InternetAddress(smtpProperties.get("mail.smtp.from").toString())); - // send the email - logger.debug("Email begin send..."); + message.setSubject(subject); - email.send(); + MimeBodyPart mimeBodyPart = new MimeBodyPart(); - logger.debug("Email sent successfully"); + // mimeBodyPart.setContent(messageText, "text/html; + // charset=utf-8"); + mimeBodyPart.setText(messageText, "utf-8"); - } - catch (Exception mex) + Multipart multipart = new MimeMultipart(); + multipart.addBodyPart(mimeBodyPart); + + if (filename.equals("") == false) { - logger.error("Error sending email : " + mex.getMessage()); - result = false; + logger.debug("Email add attachment [" + util.getFilenameFromPath(filename) + "]"); + + MimeBodyPart attachmentBodyPart = new MimeBodyPart(); + attachmentBodyPart.attachFile(new File(filename)); + attachmentBodyPart.setDescription(filename); + + multipart.addBodyPart(attachmentBodyPart); + } + message.setContent(multipart); + logger.debug("Sending email"); + Transport.send(message); + logger.debug("Email sent"); + + message = null; + } + catch (Exception ex) + { + logger.error("Error encountered sending email [" + ex.getMessage() + "]"); } } - catch (Exception mex) + else { - logger.error("Error sending email : " + mex.getMessage()); - result = false; + // okToSend = false; + logger.debug("Email suppressed - too frequent"); } - attachment = null; - email = null; - } } else { diff --git a/b6Middleware/src/com/commander4j/mw/StartMain.java b/b6Middleware/src/com/commander4j/mw/StartMain.java index 3fe5923..9f2fcf2 100644 --- a/b6Middleware/src/com/commander4j/mw/StartMain.java +++ b/b6Middleware/src/com/commander4j/mw/StartMain.java @@ -16,7 +16,7 @@ public class StartMain Logger logger = org.apache.logging.log4j.LogManager.getLogger((StartMain.class)); public MiddlewareConfig cfg; - public static String version = "5.11"; + public static String version = "5.20"; Boolean running = false; LogArchiveThread archiveLog; StatusThread statusthread; diff --git a/b6Middleware/xml/config/email.xml b/b6Middleware/xml/config/email.xml index 646f23d..923fcee 100644 --- a/b6Middleware/xml/config/email.xml +++ b/b6Middleware/xml/config/email.xml @@ -53,7 +53,7 @@ - + dummy1@gmail.com,dummy2@gmail.com diff --git a/b6Middleware/xslt/MII_MM_XML_to_C4J_XML_NO_LEGACY.xsl b/b6Middleware/xslt/MII_MM_XML_to_C4J_XML_NO_LEGACY.xsl new file mode 100644 index 0000000..775b7e2 --- /dev/null +++ b/b6Middleware/xslt/MII_MM_XML_to_C4J_XML_NO_LEGACY.xsl @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Material Definition + Input + + + DOCNUM + Material=/ + + + + + + + + + + + + + + + + + + Description for language + + + + + + N + + + + Y + + + + + Use PLANT = [] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + * LE VALUES * + LE Quantity = + LE Unit = + LE Numerator = + LE Denominator = + * BASE VALUES * + Base Unit = + * CALCULATIONS * + Converting LE Quantity from to + + + + D97 (in ) = () x = + + Calculated LE quantity is + + + + + + + + + LE Qty is different to Normal Qty - setting override flag + + X + + + + LE Qty is the same Normal Qty + + + + + + + + LE Values NOT Found + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +