From bc9b512a45d775341494fed3d3becefe7b68ea51 Mon Sep 17 00:00:00 2001 From: michaeloffner Date: Fri, 13 Dec 2024 11:46:33 +0100 Subject: [PATCH] LDEV-5043 - allow alias "whitespaceManagement" --- .../src/main/java/lucee/runtime/config/ConfigWebFactory.java | 5 +++++ loader/build.xml | 2 +- loader/pom.xml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java index e0a106a41d..13aee8e2b6 100644 --- a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java +++ b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java @@ -3612,10 +3612,15 @@ private static void _loadSetting(ConfigServerImpl configServer, ConfigImpl confi str = SystemUtil.getSystemPropOrEnvVar("lucee.cfml.writer", null); if (StringUtil.isEmpty(str)) { str = getAttr(root, "cfmlWriter"); + + // CB compatibility + if (StringUtil.isEmpty(str, true)) str = getAttr(root, "whitespaceManagement"); } if (!StringUtil.isEmpty(str) && hasAccess) { if ("white-space".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS); + else if ("simple".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS); else if ("white-space-pref".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS_PREF); + else if ("smart".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS_PREF); else if ("regular".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_REFULAR); // FUTURE add support for classes implementing CFMLWriter interface } diff --git a/loader/build.xml b/loader/build.xml index 4e998ffa88..5a1e8188ee 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index b36735af26..6325d8377a 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.1.2.7-SNAPSHOT + 6.1.2.8-SNAPSHOT jar Lucee Loader Build