Release XLT 6.2.2

.gitignore

@@ -5,3 +5,6 @@
 /reports/
 /results/
 /target/
+/resultbrowser/node_modules/
+/resultbrowser/dist/
+/resultbrowser/.parcel-cache

README.md

@@ -15,6 +15,7 @@ The XLT build process is based on the **Apache Ant** build tool. The build works
 * Latest JDK 11
 * Latest [Apache Ant](https://ant.apache.org/)
 * Chrome or Chromium browser (to package the timer-recorder extension for Chrome/Chromium)
+* Node.js in version 16.15.1 (to bundle the resultbrowser)
 * Optional tools:
     * Only if you want to run the XLT unit tests:
         * [chromedriver](https://chromedriver.chromium.org/)

ant-scripts/resultbrowser.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0"?>
+
+<project name="Resultbrowser" basedir="..">
+
+    <!-- Read in build properties file. -->
+    <property file="build.properties" />
+
+    <!-- resultbrowser bundling properties -->
+    <property name="build.resultbrowser.dir" value="resultbrowser" />
+
+    <!-- target files -->
+    <property name="source.file.index" value="${resultbrowser.dir.source}/index_bundle.html" />
+    <property name="source.file.harviewer" value="${resultbrowser.dir.source}/harviewer_bundle.html" />
+    <property name="target.file.index" value="${resultbrowser.dir.target}/index.html" />
+    <property name="target.file.harviewer" value="${resultbrowser.dir.target}/harviewer.html" />
+
+    <!-- Macro to handle OS specific Node.js call. -->
+    <macrodef name="exec-node">
+        <attribute name="module" description="The name of the NodeJS module to execute" />
+        <attribute name="failonerror" default="true" description="Fail if the exit code is not 0" />
+        <attribute name="dir" description="Directory to execute task" />
+        <element name="args" implicit="yes" description="Argument to pass to the exec task" />
+        <sequential>
+            <exec executable="cmd.exe" dir="@{dir}" failonerror="@{failonerror}" osfamily="winnt" logError="true">
+                <arg line="/c  @{module}" />
+                <args />
+            </exec>
+            <exec executable="@{module}" dir="@{dir}" failonerror="@{failonerror}" osfamily="unix" logError="true">
+                <args />
+            </exec>
+        </sequential>
+    </macrodef>
+
+    <!-- Check for JS/CSS/images into HTML. -->
+    <target name="resultbrowser.check">
+        <dependset>
+            <srcfileset dir="${resultbrowser.dir.source}" includes="*.html" erroronmissingdir="false" />
+            <targetfileset dir="${resultbrowser.dir.target}" includes="**/*" erroronmissingdir="false" />
+        </dependset>
+        <condition property="resultbrowser.present">
+            <resourcecount when="gt" count="0">
+                <fileset dir="${resultbrowser.dir.target}" includes="**/*" erroronmissingdir="false" />
+            </resourcecount>
+        </condition>
+    </target>
+
+    <!-- Bundle JS/CSS/images into HTML. -->
+    <target name="resultbrowser.bundle">
+        <exec-node dir="${build.resultbrowser.dir}" module="npm" failonerror="true">
+            <arg value="run" />
+            <arg value="build" />
+        </exec-node>
+    </target>
+
+    <!-- Copy necessary files. -->
+    <target name="resultbrowser.copy" depends="resultbrowser.check, resultbrowser.bundle" unless="resultbrowser.present">
+
+        <!-- copy index_bundle.html and rename it to index.html -->
+        <copy file="${source.file.index}" tofile="${target.file.index}" flatten="true" />
+
+        <!-- copy harviewer_bundle.html and rename it to harviewer.html -->
+        <copy file="${source.file.harviewer}" tofile="${target.file.harviewer}" flatten="true" />
+
+    </target>
+
+    <!-- Build HTML for resultbrowser. -->
+    <target name="resultbrowser.build">
+        <antcall target="resultbrowser.copy" inheritrefs="true" />
+    </target>
+
+</project>

build.properties

@@ -27,6 +27,9 @@ timerrecorder.dir = xlt-timerrecorder
 
 timerrecorder.chrome.dir = xlt-timerrecorder-chrome
 
+resultbrowser.dir.source = resultbrowser/dist
+resultbrowser.dir.target = ${classes.dir}/com/xceptance/xlt/engine/resultbrowser/assets
+
 # Linux
 timerrecorder.chrome.executable = chromium-browser
 # Windows

build.xml

@@ -25,6 +25,7 @@
     <property name="sigtest.build.file" value="${script.dir}/sigtest.xml" />
     <property name="timerrecorder.build.file" value="${script.dir}/timerrecorder.xml" />
     <property name="timerrecorder.chrome.build.file" value="${script.dir}/timerrecorder_chrome.xml" />
+    <property name="resultbrowser.build.file" value="${script.dir}/resultbrowser.xml" />
 
     <property name="settings.file" value="/home/hudson/.ant/settings.xml" />
 
@@ -185,6 +186,7 @@
 
         <antcall target="build.timerrecorder.xpi" inheritrefs="true" />
         <antcall target="build.timerrecorder.crx" inheritrefs="true" />
+        <antcall target="build.resultbrowser" inheritrefs="true" />
 
         <antcall target="download.ec2.instance-info" />
     </target>
@@ -540,4 +542,15 @@
         </ant>
     </target>
 
+    <!--
+        ==================================
+        = Resultbrowser bundling.      =
+        ==================================
+    -->
+
+    <target name="build.resultbrowser" depends="init">
+        <ant antfile="${resultbrowser.build.file}" target="resultbrowser.build" inheritall="false" inheritrefs="false">
+        </ant>
+    </target>
+
 </project>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.xceptance</groupId>
     <artifactId>xlt</artifactId>
-    <version>6.2.1</version>
+    <version>6.2.2</version>
     <packaging>jar</packaging>
 
     <name>XLT</name>

resultbrowser/.parcelrc

@@ -0,0 +1,4 @@
+{
+  "extends": "@parcel/config-default",
+  "resolvers": ["parcel-resolver-ignore", "..."]
+}