Release XLT 8.3.0

Xceptance · Jul 12, 2024 · 7ab2471 · 7ab2471
2 parents 1b429c8 + 832d275
commit 7ab2471
Show file tree

Hide file tree

Showing 69 changed files with 5,769 additions and 709 deletions.
diff --git a/NOTICE.md b/NOTICE.md
@@ -250,6 +250,12 @@ progressbar
   * Homepage: https://github.com/ctongfei/progressbar
   * More information in folder: doc/3rd-party-licenses/progressbar
 
+saxon-he
+
+  * License: Mozilla Public License 2.0
+  * Homepage: https://www.saxonica.com/
+  * More information in folder: doc/3rd-party-licenses/saxon-he
+
 selenium-java
 
   * License: Apache License 2.0
@@ -298,18 +304,6 @@ websocket-client
   * Homepage: https://www.eclipse.org/jetty/
   * More information in folder: doc/3rd-party-licenses/websocket-client
 
-xalan
-
-  * License: Apache License 2.0
-  * Homepage: https://xml.apache.org/xalan-j/
-  * More information in folder: doc/3rd-party-licenses/xalan
-
-xerces
-
-  * License: Apache License 2.0
-  * Homepage: http://xerces.apache.org/xerces2-j/
-  * More information in folder: doc/3rd-party-licenses/xerces
-
 xstream
 
   * License: BSD 3-Clause License

diff --git a/bin/update_scorecard.cmd b/bin/update_scorecard.cmd
@@ -0,0 +1,31 @@
+@echo off
+setlocal enabledelayedexpansion
+
+:: setup basic paths
+set CWD=%CD%
+cd /d %~dp0\..
+set XLT_HOME=%CD%
+cd /d %CWD%
+
+if not defined XLT_CONFIG_DIR set XLT_CONFIG_DIR=%XLT_HOME%\config
+
+:: setup Java class path
+set CLASSPATH=%XLT_HOME%\target\classes;%XLT_HOME%\lib\*
+
+:: setup other Java options
+set JAVA_OPTIONS=
+set JAVA_OPTIONS=%JAVA_OPTIONS% -Xmx4g
+set JAVA_OPTIONS=%JAVA_OPTIONS% -XX:+UseStringDeduplication
+set JAVA_OPTIONS=%JAVA_OPTIONS% -Dcom.xceptance.xlt.home="%XLT_HOME%"
+set JAVA_OPTIONS=%JAVA_OPTIONS% -Dlog4j2.configurationFile="%XLT_CONFIG_DIR%\reportgenerator.properties"
+rem set JAVA_OPTIONS=%JAVA_OPTIONS% -agentlib:jdwp=transport=dt_socket,address=localhost:6666,server=y,suspend=n
+set JAVA_OPTIONS=%JAVA_OPTIONS% -cp "%CLASSPATH%"
+
+:: append options to suppress illegal access warnings for Java 9+
+set PACKAGES=java.base/java.lang.reflect java.base/java.text java.base/java.util java.desktop/java.awt.font
+for %%p in (%PACKAGES%) do set JAVA_OPTIONS=!JAVA_OPTIONS! --add-opens=%%p=ALL-UNNAMED
+set JAVA_OPTIONS=%JAVA_OPTIONS% -XX:+IgnoreUnrecognizedVMOptions
+rem set JAVA_OPTIONS=%JAVA_OPTIONS% --illegal-access=debug
+
+:: run Java
+java %JAVA_OPTIONS% com.xceptance.xlt.report.scorecard.UpdateMain %*
diff --git a/bin/update_scorecard.sh b/bin/update_scorecard.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# setup basic paths 
+CWD=`pwd`
+cd "`dirname "$0"`/.."
+XLT_HOME=`pwd`
+cd "$CWD"
+export XLT_HOME
+
+if [ -z "$XLT_CONFIG_DIR" ]; then
+    XLT_CONFIG_DIR=$XLT_HOME/config
+    export XLT_CONFIG_DIR
+fi
+
+# setup Java class path
+CLASSPATH="$XLT_HOME"/target/classes:"$XLT_HOME"/lib/*
+
+# setup other Java options
+JAVA_OPTIONS=
+JAVA_OPTIONS="$JAVA_OPTIONS -Xmx4g"
+JAVA_OPTIONS="$JAVA_OPTIONS -XX:+UseStringDeduplication"
+JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.xceptance.xlt.home=\"$XLT_HOME\""
+JAVA_OPTIONS="$JAVA_OPTIONS -Dlog4j2.configurationFile=\"$XLT_CONFIG_DIR/reportgenerator.properties\""
+JAVA_OPTIONS="$JAVA_OPTIONS -Djava.awt.headless=true"
+#JAVA_OPTIONS="$JAVA_OPTIONS -agentlib:jdwp=transport=dt_socket,address=localhost:6666,server=y,suspend=n"
+#JAVA_OPTIONS="$JAVA_OPTIONS -XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints -XX:FlightRecorderOptions=stackdepth=1024"
+#JAVA_OPTIONS="$JAVA_OPTIONS -XX:+UnlockDiagnosticVMOptions -XX:+PrintCompilation -XX:+PrintInlining"
+#JAVA_OPTIONS="$JAVA_OPTIONS -XX:MaxInlineSize=128 -XX:FreqInlineSize=1024"
+
+JAVA_OPTIONS="$JAVA_OPTIONS -cp \"$CLASSPATH\""
+
+# append options to suppress illegal access warnings for Java 9+
+PACKAGES="java.base/java.lang.reflect java.base/java.text java.base/java.util java.desktop/java.awt.font"
+for p in $PACKAGES; do JAVA_OPTIONS="$JAVA_OPTIONS --add-opens=$p=ALL-UNNAMED"; done
+JAVA_OPTIONS="$JAVA_OPTIONS -XX:+IgnoreUnrecognizedVMOptions" 
+#JAVA_OPTIONS="$JAVA_OPTIONS --illegal-access=debug"
+
+# run Java
+CMD="java $JAVA_OPTIONS com.xceptance.xlt.report.scorecard.UpdateMain"
+ARGS=""
+I=1
+while [ $I -le $# ]; do
+    eval x=\${$I}
+    ARGS="$ARGS \"$x\""
+    I=$((I+1))
+done
+eval $CMD "$ARGS"
diff --git a/config/xsl/common/sections/header.xsl b/config/xsl/common/sections/header.xsl
@@ -8,11 +8,19 @@
         <xsl:param name="productUrl" select="/testreport/configuration/version/productURL" />
         <xsl:param name="projectName" select="/testreport/configuration/projectName" />
         <xsl:param name="properties" select="/testreport/configuration/properties" />
+        <xsl:param name="scorecardPresent" select="false" />
+        <!-- XTC specific parameters -->
+        <xsl:param name="xtcOrganization" select="$properties/property[@name='com.xceptance.xtc.organization']/@value" />
+        <xsl:param name="xtcProject" select="$properties/property[@name='com.xceptance.xtc.project']/@value" />
+        <xsl:param name="xtcLoadTestId" select="$properties/property[@name='com.xceptance.xtc.loadtest.run.id']/@value" />
+        <xsl:param name="xtcResultId" select="$properties/property[@name='com.xceptance.xtc.loadtest.result.id']/@value" />
+        <xsl:param name="xtcReportId" select="$properties/property[@name='com.xceptance.xtc.loadtest.report.id']/@value" />
 
         <xsl:variable name="normProjName" select="normalize-space($projectName)" />
 
         <xsl:call-template name="navigation">
             <xsl:with-param name="current" select="general" />
+            <xsl:with-param name="scorecardPresent" select="$scorecardPresent" />
         </xsl:call-template>
 
         <header id="header">
@@ -28,33 +36,33 @@
                     <xsl:value-of select="$title" />
                 </h1>
                 <xsl:choose>
-                <xsl:when test="$properties/property[@name='com.xceptance.xtc.organization']">
+                <xsl:when test="$xtcOrganization">
                 <div>
-                	<div class="ltinfo">
-                		<span class="key">Organization:</span>
-                		<span class="value"><xsl:value-of select="$properties/property[@name='com.xceptance.xtc.organization']/@value" /></span>
-                	</div>
-                	<div class="ltinfo">
-                		<span class="key">Project:</span>
-						<span class="value"><xsl:value-of select="$properties/property[@name='com.xceptance.xtc.project']/@value" /></span>
-                	</div>
-                	<div class="ltinfo">
-                		<span class="key">Load Test:</span>
-						<span class="value"><xsl:value-of select="$properties/property[@name='com.xceptance.xtc.loadtest.run.id']/@value" /></span>
-                	</div>
-                	<div class="ltinfo">
-                		<span class="key">Result:</span>
-                		<span class="value"><xsl:value-of select="$properties/property[@name='com.xceptance.xtc.loadtest.result.id']/@value" /></span>
-                	</div>
-                	<div class="ltinfo">
-                		<span class="key">Report:</span>
-						<span class="value"><xsl:value-of select="$properties/property[@name='com.xceptance.xtc.loadtest.report.id']/@value" /></span>
-                	</div>
+                    <div class="ltinfo">
+                        <span class="key">Organization:</span>
+                        <span class="value"><xsl:value-of select="$xtcOrganization" /></span>
+                    </div>
+                    <div class="ltinfo">
+                        <span class="key">Project:</span>
+                        <span class="value"><xsl:value-of select="$xtcProject" /></span>
+                    </div>
+                    <div class="ltinfo">
+                        <span class="key">Load Test:</span>
+                        <span class="value"><xsl:value-of select="$xtcLoadTestId" /></span>
+                    </div>
+                    <div class="ltinfo">
+                        <span class="key">Result:</span>
+                        <span class="value"><xsl:value-of select="$xtcResultId" /></span>
+                    </div>
+                    <div class="ltinfo">
+                        <span class="key">Report:</span>
+                        <span class="value"><xsl:value-of select="$xtcReportId" /></span>
+                    </div>
                 </div>
                 </xsl:when>
-				<xsl:otherwise>
+                <xsl:otherwise>
                 <h2 class="ltinfo hide-on-scroll">
-                	Created with
+                Created with
                     <a href="{$productUrl}?source=TestReport">
                         <span class="productname">
                             <xsl:value-of select="$productName" />
@@ -65,9 +73,9 @@
                     </a>
                 </h2>
                 <div class="ltinfo show-on-scroll">
-                	<xsl:if test="string-length($normProjName) &gt; 0">
-						<span class="value"><xsl:value-of select="$normProjName" /></span>
-						&#8212;
+                    <xsl:if test="string-length($normProjName) &gt; 0">
+                        <span class="value"><xsl:value-of select="$normProjName" /></span>
+                        &#8212;
                     </xsl:if>
                     <xsl:value-of select="$title" />
                 </div>

diff --git a/config/xsl/diffreport/actions.xsl b/config/xsl/diffreport/actions.xsl
@@ -40,7 +40,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/diffreport/custom-timers.xsl b/config/xsl/diffreport/custom-timers.xsl
@@ -40,7 +40,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/diffreport/custom-values.xsl b/config/xsl/diffreport/custom-values.xsl
@@ -40,7 +40,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/diffreport/index.xsl b/config/xsl/diffreport/index.xsl
@@ -42,7 +42,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/diffreport/page-load-timings.xsl b/config/xsl/diffreport/page-load-timings.xsl
@@ -40,7 +40,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/diffreport/requests.xsl b/config/xsl/diffreport/requests.xsl
@@ -40,7 +40,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/diffreport/transactions.xsl b/config/xsl/diffreport/transactions.xsl
@@ -40,7 +40,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/diffreport/web-vitals.xsl b/config/xsl/diffreport/web-vitals.xsl
@@ -40,7 +40,6 @@
 
 <xsl:template match="testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
 <html lang="en">
 <head>
     <xsl:call-template name="head">

diff --git a/config/xsl/loadreport/actions.xsl b/config/xsl/loadreport/actions.xsl
@@ -41,11 +41,11 @@
 <xsl:param name="productVersion" />
 <xsl:param name="productUrl" />
 <xsl:param name="projectName" />
+<xsl:param name="scorecardPresent" />
 
 <xsl:template match="/testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
-<html lang="en">    
+<html lang="en">
 <head>
     <xsl:call-template name="head">
         <xsl:with-param name="title" select="'XLT Report - Actions'" />
@@ -56,7 +56,9 @@
 <body id="loadtestreport">
 <div id="container">
     <div id="content">
-        <xsl:call-template name="header" />
+        <xsl:call-template name="header">
+            <xsl:with-param name="scorecardPresent" select="$scorecardPresent" />
+        </xsl:call-template>
 
         <div id="data-content">
 

diff --git a/config/xsl/loadreport/agents.xsl b/config/xsl/loadreport/agents.xsl
@@ -36,11 +36,11 @@
 <xsl:param name="productVersion" />
 <xsl:param name="productUrl" />
 <xsl:param name="projectName" />
+<xsl:param name="scorecardPresent" />
 
 <xsl:template match="/testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
-<html lang="en">    
+<html lang="en">
 <head>
     <xsl:call-template name="head">
         <xsl:with-param name="title" select="'XLT Report - Agents'" />
@@ -50,7 +50,9 @@
 <body id="loadtestreport">
 <div id="container">
     <div id="content">
-        <xsl:call-template name="header" />
+        <xsl:call-template name="header">
+            <xsl:with-param name="scorecardPresent" select="$scorecardPresent" />
+        </xsl:call-template>
 
         <div id="data-content">
 

diff --git a/config/xsl/loadreport/configuration.xsl b/config/xsl/loadreport/configuration.xsl
@@ -35,11 +35,11 @@
 <xsl:param name="productVersion" />
 <xsl:param name="productUrl" />
 <xsl:param name="projectName" />
+<xsl:param name="scorecardPresent" />
 
 <xsl:template match="/testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
-<html lang="en">    
+<html lang="en">
 <head>
     <xsl:call-template name="head">
         <xsl:with-param name="title" select="'XLT Report - Configuration'" />
@@ -49,7 +49,9 @@
 <body id="loadtestreport">
 <div id="container">
     <div id="content">
-        <xsl:call-template name="header" />
+        <xsl:call-template name="header">
+            <xsl:with-param name="scorecardPresent" select="$scorecardPresent" />
+        </xsl:call-template>
 
         <div id="data-content">
 

diff --git a/config/xsl/loadreport/custom-timers.xsl b/config/xsl/loadreport/custom-timers.xsl
@@ -41,11 +41,11 @@
 <xsl:param name="productVersion" />
 <xsl:param name="productUrl" />
 <xsl:param name="projectName" />
+<xsl:param name="scorecardPresent" />
 
 <xsl:template match="/testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
-<html lang="en">    
+<html lang="en">
 <head>
     <xsl:call-template name="head">
         <xsl:with-param name="title" select="'XLT Report - Custom Timers'" />
@@ -55,7 +55,9 @@
 <body id="loadtestreport">
 <div id="container">
     <div id="content">
-        <xsl:call-template name="header" />
+        <xsl:call-template name="header">
+            <xsl:with-param name="scorecardPresent" select="$scorecardPresent" />
+        </xsl:call-template>
 
         <div id="data-content">
 

diff --git a/config/xsl/loadreport/custom-values.xsl b/config/xsl/loadreport/custom-values.xsl
@@ -41,11 +41,11 @@
 <xsl:param name="productVersion" />
 <xsl:param name="productUrl" />
 <xsl:param name="projectName" />
+<xsl:param name="scorecardPresent" />
 
 <xsl:template match="/testreport">
 
-<xsl:text disable-output-escaping="yes">&lt;!</xsl:text><xsl:text>DOCTYPE html</xsl:text><xsl:text disable-output-escaping="yes">&gt;&#13;</xsl:text>
-<html lang="en">    
+<html lang="en">
 <head>
     <xsl:call-template name="head">
         <xsl:with-param name="title" select="'XLT Report - Custom Values'" />
@@ -55,7 +55,9 @@
 <body id="loadtestreport">
 <div id="container">
     <div id="content">
-        <xsl:call-template name="header" />
+        <xsl:call-template name="header">
+            <xsl:with-param name="scorecardPresent" select="$scorecardPresent" />
+        </xsl:call-template>
 
         <div id="data-content">