From 11d30dd50f0d47b587b2e69643b706a0018633bf Mon Sep 17 00:00:00 2001
From: viktar_patsiaichuk <viktar_patsiaichuk@epam.com>
Date: Tue, 25 Jul 2023 15:57:51 +0400
Subject: [PATCH] Fix issue after assemble-scripts.xml renaming

---
 framework/impl/assemble-scripts.xml           |  4 +--
 .../renderkit/html/scripts/jquery/jquery.js   |  2 +-
 .../scripts/scriptaculous/scriptaculous.js    |  4 +--
 readme.md                                     | 29 +++++++++++++++----
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/framework/impl/assemble-scripts.xml b/framework/impl/assemble-scripts.xml
index fea1bfc..8300c95 100644
--- a/framework/impl/assemble-scripts.xml
+++ b/framework/impl/assemble-scripts.xml
@@ -9,11 +9,11 @@
 
     <filelist id="scriptaculous"
         dir="${basedir}/src/main/java/${richfaces.scripts.path}/scriptaculous"
-        files="builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js">
+        files="builder.js, effects.js, dragdrop.js, controls.js, slider.js, sound.js">
     </filelist>
     <filelist id="jquery"
         dir="${basedir}/src/main/java/${richfaces.scripts.path}/jquery"
-        files="jquery-3.7.0-patched.js,jquery.richfaces.js">
+        files="jquery-3.7.0-patched.js, jquery.richfaces.js">
     </filelist>
 
     <target name="assemble" depends="depends" description="Concat JavaScripts files">
diff --git a/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/jquery/jquery.js b/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/jquery/jquery.js
index c719ede..d331dc1 100644
--- a/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/jquery/jquery.js
+++ b/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/jquery/jquery.js
@@ -1,3 +1,3 @@
-// This file is assembled by generatescript.xml
+// This file is assembled by ANT script: assemble-scripts.xml
 // As files concatenation: jquery-3.7.0-patched.js, jquery.richfaces.js
 throw new Error("jquery.js was not assembled")
\ No newline at end of file
diff --git a/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous.js b/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous.js
index 3a0ffa1..9a20591 100644
--- a/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous.js
+++ b/framework/impl/src/main/java/org/richfaces/renderkit/html/scripts/scriptaculous/scriptaculous.js
@@ -1,3 +1,3 @@
-// This file is assembled by generatescript.xml
-// As files concatenation: builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js
+// This file is assembled by ANT script: assemble-scripts.xml
+// As files concatenation: builder.js, effects.js, dragdrop.js, controls.js, slider.js, sound.js
 throw new Error("scriptaculous.js was not assembled")
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 4d66ebc..8bc8b63 100644
--- a/readme.md
+++ b/readme.md
@@ -48,7 +48,7 @@ mvn deploy
 # Notes
 - Java `1.5.0_12` is used to build the project 
   `framework/impl/pom.xml`
-  ```
+  ```xml
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-toolchains-plugin</artifactId>
@@ -71,9 +71,9 @@ mvn deploy
       </plugin>
   ```
  
-- `scriptaculous.js` is assembled as concat of files: `builder.js,effects.js,dragdrop.js,controls.js,slider.js,sound.js` 
+- `scriptaculous.js` is assembled as concat of files: `builder.js, effects.js, dragdrop.js, controls.js, slider.js, sound.js` 
   using Apache Ant script: `generatescript.xml`
-  ```
+  ```xml
         <concat append="false"
             binary="false"
             destfile="${target.dir}/${richfaces.scripts.path}/scriptaculous/scriptaculous.js"
@@ -83,8 +83,10 @@ mvn deploy
         </concat>
   ``` 
   
-- JavaScript files are copied to `target` directory using Apache Ant script `generatescript.xml`
-  ```
+- `jquery.js` is assembled as concat of fies: `jquery-3.7.0-patched.js, jquery.richfaces.js` 
+ 
+- JavaScript files are copied to `target` directory using Apache Ant script `assemble-scripts.xml`
+  ```xml
         <copy todir="${target.dir}/${ajax4jsf.scripts.path}">
             <fileset dir="${source.dir}/${ajax4jsf.scripts.path}" includes="**/*.js"/>
         </copy>
@@ -95,7 +97,7 @@ mvn deploy
    
 - JavaScript files are compressed and concat into `framework.pack.js` file using `org.richfaces.cdk:maven-javascript-plugin` plugin
   `framework/impl/pom.xml`
-  ```
+  ```xml
       <plugin>
         <groupId>org.richfaces.cdk</groupId>
         <artifactId>maven-javascript-plugin</artifactId>
@@ -109,4 +111,19 @@ mvn deploy
         </dependencies>
       </plugin>
   ``` 
+- To switch `on` or `off` javascript files minification in `framework.pack.js` use option `<nomunge>false</nomunge>` or `<nomunge>true</nomunge>`
+ `framework/impl/pom.xml`
+  ```xml
+        <executions>
+          <execution>
+            <goals>
+              <goal>compress</goal>
+            </goals>
+            <configuration>
+              <nosuffix>false</nosuffix>
+              <!-- Uncomment to disable minification -->
+              <!-- <nomunge>true</nomunge> -->
+              <outputDirectory>${project.build.directory}/compressed/</outputDirectory>
+  
+  ```
  
\ No newline at end of file