From ccda5e44952dc499267fbe4beb99014f7416fa1d Mon Sep 17 00:00:00 2001
From: PeterTakacs300 <93127072+PeterTakacs300@users.noreply.github.com>
Date: Thu, 17 Mar 2022 15:36:02 +0100
Subject: [PATCH] IDEMPIERE-5225 - HTML Report minification (#1237)
* IDEMPIERE-5225 - HTML Report minification
* IDEMPIERE-5225 - SysConfig added
* IDEMPIERE-5225 - minification default set to true
---
.../oracle/202203161513_IDEMPIERE-5225.sql | 10 +++
.../202203161513_IDEMPIERE-5225.sql | 7 ++
org.adempiere.base/META-INF/MANIFEST.MF | 4 +-
org.adempiere.base/build.properties | 4 +-
org.adempiere.base/pom.xml | 10 +++
.../src/org/compiere/model/MSysConfig.java | 1 +
.../src/org/compiere/print/ReportEngine.java | 82 +++++++++++++------
7 files changed, 90 insertions(+), 28 deletions(-)
create mode 100644 migration/iD10/oracle/202203161513_IDEMPIERE-5225.sql
create mode 100644 migration/iD10/postgresql/202203161513_IDEMPIERE-5225.sql
diff --git a/migration/iD10/oracle/202203161513_IDEMPIERE-5225.sql b/migration/iD10/oracle/202203161513_IDEMPIERE-5225.sql
new file mode 100644
index 0000000000..62b0e070a6
--- /dev/null
+++ b/migration/iD10/oracle/202203161513_IDEMPIERE-5225.sql
@@ -0,0 +1,10 @@
+-- IDEMPIERE-5225
+SELECT register_migration_script('202203161513_IDEMPIERE-5225.sql') FROM dual;
+
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- Mar 16, 2022, 3:13:31 PM CET
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200197,0,0,TO_TIMESTAMP('2022-03-16 15:13:30','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2022-03-16 15:13:30','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','HTML_REPORT_MINIFY','Y','Enable/disable minification on HTML Reports','D','C','9f3e162c-653e-4f45-9b1c-8151caf0945e')
+;
+
diff --git a/migration/iD10/postgresql/202203161513_IDEMPIERE-5225.sql b/migration/iD10/postgresql/202203161513_IDEMPIERE-5225.sql
new file mode 100644
index 0000000000..14ba0b7e72
--- /dev/null
+++ b/migration/iD10/postgresql/202203161513_IDEMPIERE-5225.sql
@@ -0,0 +1,7 @@
+-- IDEMPIERE-5225
+SELECT register_migration_script('202203161513_IDEMPIERE-5225.sql') FROM dual;
+
+-- Mar 16, 2022, 3:13:31 PM CET
+INSERT INTO AD_SysConfig (AD_SysConfig_ID,AD_Client_ID,AD_Org_ID,Created,Updated,CreatedBy,UpdatedBy,IsActive,Name,Value,Description,EntityType,ConfigurationLevel,AD_SysConfig_UU) VALUES (200197,0,0,TO_TIMESTAMP('2022-03-16 15:13:30','YYYY-MM-DD HH24:MI:SS'),TO_TIMESTAMP('2022-03-16 15:13:30','YYYY-MM-DD HH24:MI:SS'),100,100,'Y','HTML_REPORT_MINIFY','Y','Enable/disable minification on HTML Reports','D','C','9f3e162c-653e-4f45-9b1c-8151caf0945e')
+;
+
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 7ab830a2f6..eb4864a4a2 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -7,7 +7,9 @@ Bundle-ClassPath: .,
lib/bsh.jar,
lib/commons-validator.jar,
lib/cron4j.jar,
- lib/avalon-framework-api.jar
+ lib/avalon-framework-api.jar,
+ lib/htmlcompressor.jar,
+ lib/yuicompressor.jar
Export-Package: bsh,
bsh.classpath,
bsh.collection,
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 3efca01f4c..64a18fa1a6 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -6,7 +6,9 @@ bin.includes = plugin.xml,\
lib/avalon-framework-api.jar,\
lib/bsh.jar,\
lib/commons-validator.jar,\
- lib/cron4j.jar
+ lib/cron4j.jar,\
+ lib/htmlcompressor.jar,\
+ lib/yuicompressor.jar
src.includes = schema/
source.. = src/
output.. = target/classes/
diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml
index e22b69cd11..1c4c6c50e9 100644
--- a/org.adempiere.base/pom.xml
+++ b/org.adempiere.base/pom.xml
@@ -43,6 +43,16 @@