Release XLT 7.2.0

Xceptance · Aug 23, 2023 · fddd92b · fddd92b
2 parents c00d3ef + 6b2eac2
commit fddd92b
Show file tree

Hide file tree

Showing 24 changed files with 1,113 additions and 259 deletions.
diff --git a/build.properties b/build.properties
@@ -31,7 +31,7 @@ resultbrowser.dir.source = resultbrowser/dist
 resultbrowser.dir.target = ${classes.dir}/com/xceptance/xlt/engine/resultbrowser/assets
 
 # Linux
-timerrecorder.chrome.executable = chromium-browser
+timerrecorder.chrome.executable = chromium
 # Windows
 #timerrecorder.chrome.executable = C:/Program Files (x86)/Google/Chrome/Application/chrome.exe
 # macOS

diff --git a/build.xml b/build.xml
@@ -271,16 +271,12 @@
                 <file name="${api.doc.file.name}.zip" />
             </srcfilelist>
             <srcfileset dir="${basedir}">
-                <include name="agent" />
                 <include name="bin/**" />
                 <include name="config/**" />
                 <include name="doc/3rd-party-licenses/**" />
-                <include name="log" />
-                <include name="reports" />
-                <include name="results" />
-                <include name="samples/**" />
-                <exclude name="**/samples/testsuite-performance/**/*" />
-                <exclude name="**/samples/testsuite-xlt/**/*" />
+                <include name="etc/**" />
+                <include name="LICENSE" />
+                <include name="NOTICE.md" />
             </srcfileset>
             <srcfileset dir="${lib.dir}" includes="**/*.jar" />
             <srcfileset dir="${build.dir}" includes="downloads/**/*" />
@@ -337,40 +333,21 @@
             <zipfileset dir="${basedir}" prefix="${bin.dist.name}" filemode="754">
                 <include name="bin/**/*.sh" />
             </zipfileset>
-
-            <zipfileset dir="${basedir}" prefix="${bin.dist.name}">
-                <include name="samples/**" />
-                <exclude name="samples/app-server/bin/*.sh" />
-                <exclude name="**/samples/testsuite-performance/**" />
-                <exclude name="**/samples/testsuite-xlt/**" />
-                <exclude name="**/samples/app-server/webapps/performance/**" />
-                <exclude name="**/samples/app-server/webapps/testpages/**" />
-                <exclude name="**/.settings/**" />
-                <exclude name="**/.gitkeep" />
-            </zipfileset>
-            <zipfileset dir="${basedir}" prefix="${bin.dist.name}" filemode="754">
-                <include name="samples/app-server/bin/*.sh" />
-            </zipfileset>
-
             <zipfileset dir="${basedir}" prefix="${bin.dist.name}">
                 <include name="agent" />
                 <include name="config/**" />
                 <include name="doc/3rd-party-licenses/**" />
+                <include name="etc/**" />
                 <include name="log" />
                 <include name="reports" />
                 <include name="results" />
                 <include name="LICENSE" />
                 <include name="NOTICE.md" />
-                <exclude name="**/.settings/**" />
             </zipfileset>
             <zipfileset dir="${build.dir}" prefix="${bin.dist.name}">
                 <include name="lib/**" />
             </zipfileset>
-            <zipfileset dir="${basedir}" prefix="${bin.dist.name}">
-                <include name="etc/**" />
-            </zipfileset>
             <zipfileset dir="target/downloads" includes="xlt-jenkins-plugin-*.hpi" fullpath="${bin.dist.name}/tools/xlt-jenkins-plugin-${jenkins-plugin.version}/xlt-jenkins-plugin.hpi" />
-            <zipfileset dir="target/downloads" includes="demo-poster-store-*.war" fullpath="${bin.dist.name}/samples/app-server/webapps/posters.war" />
         </zip>
 
         <checksum file="${dist.dir}/${bin.dist.name}.zip" algorithm="SHA-256" fileext=".sha256" />

diff --git a/config/mastercontroller.properties b/config/mastercontroller.properties
@@ -63,6 +63,16 @@ com.xceptance.xlt.mastercontroller.password = xceptance
 #com.xceptance.xlt.mastercontroller.maxParallelUploads = -1
 #com.xceptance.xlt.mastercontroller.maxParallelDownloads = -1
 
+## The size of a file chunk (in bytes, defaults to 100 MB; minimum value: 1000)
+## when downloading test result archives from the agent controllers in chunks.
+## The chunked mode will be used automatically unless the agent controller does
+## not support it.
+#com.xceptance.xlt.mastercontroller.download.chunkSize = 100000000
+
+## The maximum number of retries if downloading a file (chunk) from an agent
+## controller failed because of an I/O error (defaults to 1; minimum value: 0).
+#com.xceptance.xlt.mastercontroller.download.maxRetries = 1
+
 # ==================
 #  Result Storage
 # ==================

diff --git a/config/testreport/css/default.css b/config/testreport/css/default.css
@@ -380,7 +380,6 @@ template {
     --navigation-dropdown-hover-bg-color: #e0e0e0;
 
     --navigation-line-height: 2;
-    --navigation-height: 25px;
 
     --header-full-height: 70px;
     --header-small-height: 30px;
@@ -434,11 +433,17 @@ body
 }
 
 @media screen and (max-width:1399px) {
+    :root {
+        --navigation-height: 25px;
+    }
     html {
         font-size: 14px;
     }
 }
 @media screen and (min-width:1400px) {
+    :root {
+        --navigation-height: 28px;
+    }
     html {
         font-size: 16px;
     }

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.xceptance</groupId>
     <artifactId>xlt</artifactId>
-    <version>7.1.1</version>
+    <version>7.2.0</version>
     <packaging>jar</packaging>
 
     <name>XLT</name>

diff --git a/resultbrowser/src/css/default.css b/resultbrowser/src/css/default.css
@@ -553,44 +553,6 @@ table.key-value-table td.value .csep {
     visibility: hidden !important;
 }
 
-
-
-/********************************************************************************************
- *
- * JSON Viewer
- * 
- ********************************************************************************************/
-
-#jsonViewer {}
-
-#jsonViewerActions {
-    font-size: 13px;
-    background-color: #f8f8f8;
-    border-top: 1px solid gray;
-    padding: 10px;
-}
-
-#jsonViewerActions button {
-    padding: 0px 4px;
-    height: 26px;
-}
-
-#jsonViewerActions input[type="text"] {
-    padding: 0px 4px;
-    height: 26px;
-    box-sizing: border-box;
-}
-
-#jsonViewerContent {
-    font-size: 14px;
-    background-color: #fff;
-    color: #808080;
-    height: 100%;
-    overflow: auto;
-    padding: 10px;
-}
-
-
 /********************************************************************************************
  *
  * Miscellaneous

diff --git a/resultbrowser/src/css/jsonview.css → resultbrowser/src/css/json-tree.css b/resultbrowser/src/css/jsonview.css → resultbrowser/src/css/json-tree.css
@@ -19,13 +19,17 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-.json-line {
+json-tree {
+    display: block;
+}
+
+json-tree .json-line {
     margin: 4px 0;
     display: flex;
     justify-content: flex-start;
 }
 
-.json-caret::after {
+json-tree .json-caret::after {
     min-width: 16px;
     cursor: pointer;
     font-style: normal;
@@ -36,67 +40,67 @@
     transform: translateY(-10%) rotate(-45deg);
 }
 
-.json-caret-expanded::after {
+json-tree .json-caret-expanded::after {
     transform: translateY(-10%) rotate(0deg);
 }
 
-.json-caret-empty::after {
+json-tree .json-caret-empty::after {
     cursor: default;
     display: none;
 }
 
-.json-key {
+json-tree .json-key {
     color: #444;
     margin-right: 4px;
     margin-left: 4px;
 }
 
-.json-size {
+json-tree .json-size {
     color: #808080;
     margin-right: 4px;
     margin-left: 4px;
 }
 
-.json-index {
+json-tree .json-index {
     color: #444;
     margin-right: 4px;
     margin-left: 4px;
 }
 
-.json-separator {
+json-tree .json-separator {
     color: #808080;
 }
 
-.json-value {
+json-tree .json-value {
     margin-left: 8px;
 }
 
-.json-number {
+json-tree .json-number {
     color: #f9ae58;
 }
 
-.json-boolean {
+json-tree .json-boolean {
     color: #ec5f66;
 }
 
-.json-string {
+json-tree .json-string {
     color: #86b25c;
 }
 
-.json-null {
+json-tree .json-null {
     color: #808080;
 }
 
-.json-match {
+json-tree .json-match {
     background-color: #DDD;
     color: #0c46dd;
 }
 
-.json-match-current {
+json-tree .json-match-current {
     background-color: #444;
     color: #FFF;
 }
 
-.json-hide {
+json-tree .json-hide {
     display: none;
 }
diff --git a/resultbrowser/src/css/json-viewer.css b/resultbrowser/src/css/json-viewer.css
@@ -0,0 +1,39 @@
+json-viewer {
+    display: block;
+}
+
+json-viewer .tree {
+    font-size: 14px;
+    background-color: #fff;
+    color: #808080;
+    height: 100%;
+    overflow: auto;
+    padding: 10px;
+}
+
+json-viewer .actions {
+    font-size: 13px;
+    background-color: #f8f8f8;
+    border-top: 1px groove gray;
+    padding: 10px;
+}
+
+json-viewer .actions button {
+    padding: 0px 4px;
+    height: 26px;
+}
+
+json-viewer .actions input[type="text"] {
+    padding: 0px 4px;
+    height: 26px;
+    box-sizing: border-box;
+}
+
+json-viewer .actions .separator {
+    display: inline-block;
+    height: 20px;
+    border-left: 1px groove gray;
+    margin: 0px 8px;
+    vertical-align: middle;
+}
+
diff --git a/resultbrowser/src/index.html b/resultbrowser/src/index.html
@@ -6,7 +6,8 @@
     <title>XLT Result Browser</title>
     <link href="https://xlt.xceptance.com/static/highlightjs/7.5/styles/xc.min.css" rel="stylesheet" type="text/css" />
     <link href="css/default.css" rel="stylesheet" type="text/css" inline />
-    <link href="css/jsonview.css" rel="stylesheet" type="text/css" inline />
+    <link href="css/json-tree.css" rel="stylesheet" type="text/css" inline />
+    <link href="css/json-viewer.css" rel="stylesheet" type="text/css" inline />
 
     <script type="text/javascript" src="https://xlt.xceptance.com/static/highlightjs/7.5/highlight.min.js" defer></script>
     <script type="text/javascript" src="https://xlt.xceptance.com/static/beautify/20140610-bdf3c2e743/beautify-min.js" defer></script>
@@ -15,7 +16,6 @@
     <script type="text/javascript" src="data.js"></script>
     <script type="text/javascript" src="js/resultbrowser.js" inline></script>
     <script type="text/javascript" src="js/split.min.js" inline></script>
-    <script type="text/javascript" src="js/jsonview.js" inline></script>
 </head>
 
 <body>
@@ -84,9 +84,10 @@ <h1>Result Browser <span id="menu-icon">&#9776;</span></h1>
                     <div id="requestcontent" class="flexContainer flexFlowColumn tabs hide">
                         <ul class="tabs-nav widthFull">
                             <li>Request/Response Information</li>
-                            <li>Request Body (Raw)</li>
-                            <li>Response Content</li>
-                            <li>JSON</li>
+                            <li>Request Body</li>
+                            <li>Request Body (JSON)</li>
+                            <li>Response Body</li>
+                            <li>Response Body (JSON)</li>
                         </ul>
                         <div class="tabs-panel">
                             <h1>Request</h1>
@@ -151,6 +152,9 @@ <h2>Response Headers</h2>
                         <div class="tabs-panel">
                             <pre id="requestbody"></pre>
                         </div>
+                        <div class="tabs-panel no-padding heightFull">
+                            <json-viewer id="requestBodyJson" class="flexContainer flexFlowColumn heightFull"></json-viewer>
+                        </div>
                         <div class="tabs-panel heightFull">
                             <div id="responseContentActions">
                                 <button id="beautify" disabled>Beautify</button>
@@ -174,17 +178,7 @@ <h2>Response Headers</h2>
                             </div>
                         </div>
                         <div class="tabs-panel no-padding heightFull">
-                            <div id="jsonViewer" class="flexContainer flexFlowColumn heightFull">
-                                <div id="jsonViewerContent"></div>
-                                <div id="jsonViewerActions">
-                                    <button class="expandAll">Expand All</button>
-                                    <button class="collapseAll">Collapse All</button>&emsp;|&emsp;Search:
-                                    <input class="search" type="text"><button class="previous">&bigtriangleup;</button><button class="next">&bigtriangledown;</button>
-                                    &ensp;<input id="ignoreCase" class="ignoreCase" type="checkbox" checked="checked">&nbsp;<label for="ignoreCase">Ignore Case</label>
-                                    &ensp;<input id="filter" class="filter" type="checkbox" checked="checked">&nbsp;<label for="filter">Filter</label>
-                                    &emsp;|&emsp;<span id="matches">0</span> Match(es)&emsp;|&emsp;JSON Path: <span id="jsonPath"></span>
-                                </div>
-                            </div>
+                            <json-viewer id="responseBodyJson" class="flexContainer flexFlowColumn heightFull"></json-viewer>
                         </div>
                     </div>
 
@@ -350,6 +344,8 @@ <h1>Stored Test Parameters and Result Data</h1>
             </ul>
         </div>
     </div>
+    <script type="text/javascript" src="js/json-tree.js" inline></script>
+    <script type="text/javascript" src="js/json-viewer.js" inline></script>
 </body>
 
 </html>