[sling-org-apache-sling-scripting-jsp] 01/01: SLING-10399 - Enhance the compilation report provided by the jspc-maven-plugin

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

radu pushed a commit to branch issue/SLING-10399
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-jsp.git

commit ed28e9529a8d46f46e14f370baee7a75e34f6ef9
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Jun 1 11:50:27 2021 +0200

    SLING-10399 - Enhance the compilation report provided by the jspc-maven-plugin
    
    * expose o.a.s.scripting.jsp.jasper.compiler.PageInfo
    * keep the PageInfo object in the Compiler when running from jspc
---
 .../sling/scripting/jsp/jasper/JspCompilationContext.java    | 12 ++++++++----
 .../apache/sling/scripting/jsp/jasper/compiler/Compiler.java |  4 +++-
 .../apache/sling/scripting/jsp/jasper/compiler/PageInfo.java |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java b/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java
index 2073593..6ce4601 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/jasper/JspCompilationContext.java
@@ -495,10 +495,14 @@ public class JspCompilationContext {
     // ==================== Compile and reload ====================
 
     public JasperException compile() {
+        return compile(false);
+    }
+
+    public JasperException compile(boolean fromJSPC) {
         final Compiler c = createCompiler();
         try {
             c.removeGeneratedFiles();
-            c.compile();
+            c.compile(true, fromJSPC);
         } catch (final JasperException ex) {
             return ex;
         } catch (final IOException ioe) {
@@ -508,11 +512,11 @@ public class JspCompilationContext {
             return je;
         } catch (final Exception ex) {
             JasperException je = new JasperException(
-                        Localizer.getMessage("jsp.error.unable.compile"),
-                        ex);
+                    Localizer.getMessage("jsp.error.unable.compile"),
+                    ex);
             return je;
         } finally {
-           c.clean();
+            c.clean();
         }
 
         return null;
diff --git a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
index 2a7efb9..aa85a22 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/Compiler.java
@@ -313,7 +313,9 @@ public abstract class Compiler {
             // memory footprint.
             tfp = null;
             errDispatcher = null;
-            pageInfo = null;
+            if (!jspcMode) {
+                pageInfo = null;
+            }
 
             // Only get rid of the pageNodes if in production.
             // In development mode, they are used for detailed
diff --git a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/PageInfo.java b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/PageInfo.java
index ca880da..5dbf625 100644
--- a/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/PageInfo.java
+++ b/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/PageInfo.java
@@ -36,7 +36,7 @@ import javax.servlet.jsp.tagext.TagLibraryInfo;
  * @author Kin-man Chung
  */
 
-class PageInfo {
+public class PageInfo {
 
     private Vector imports;
     private Vector dependants;