Merge pull request #198 from zivRhcl/Update-HCL-IAST-scripts

Update HCL IAST scripts

Author: davewichers

pom.xml

@@ -574,11 +574,12 @@
                                         <overwrite>true</overwrite>
                                     </configfile>
                                 </configfiles>
+                                <home>${project.build.directory}/tomcat${tomcat.major.version}x</home>
                                 <properties>
                                     <cargo.jvmargs>
                                         -Xmx8G
                                         -javaagent:${basedir}/tools/HCL/secagent.jar=agent_path=${basedir}/tools/HCL/secagent.jar
-                                        -Dsecagent.log=${basedir}/tools/HCL/working/HCL-IAST.hcl
+                                        -Dsecagent.log=${basedir}/tools/HCL/HCL-IAST.hcl
                                     </cargo.jvmargs>
                                     <cargo.servlet.port>8443</cargo.servlet.port>
                                     <cargo.protocol>https</cargo.protocol>

tools/HCL/runBenchmark_wHCL.bat

@@ -1,8 +1,8 @@
 @ECHO OFF
 IF EXIST .\secagent.jar (
-  IF EXIST .\working (
+  IF EXIST .\HCL-IAST.hcl (
 
-        RMDIR /S /Q .\working
+        DEL .\HCL-IAST.hcl
 
         ECHO.
         ECHO Previous results have been removed
@@ -15,11 +15,11 @@ IF EXIST .\secagent.jar (
     ECHO When it asks "Terminate batch job (Y/N)?" Enter N, so script will complete and copy results to /results directory.
     ECHO.
 
-    CALL mvn clean package cargo:run -Pdeploywhcl
+    CALL mvn clean package cargo:run -Pdeploywhcl -Drunenv=remote
 
     ECHO Copying HCL reports to results directory
 
-    COPY tools\HCL\working\HCL-IAST.hcl results\Benchmark_HCL-IAST.hcl
+    COPY tools\HCL\HCL-IAST.hcl results\Benchmark_HCL-IAST.hcl
 
     CD tools\HCL
 

tools/HCL/runBenchmark_wHCL.sh

@@ -2,22 +2,22 @@
 
 if [ -f ./secagent.jar ]; then
 
-  if [ -d ./working ]; then
+  if [ -d ./HCL-IAST.hcl ]; then
 
-    rm -r ./working/HCL-IAST.hcl
+    rm ./HCL-IAST.hcl
     echo ""
-    echo "Previous  results in /working removed"
+    echo "Previous results have been removed"
     echo ""
 
   fi
 
   cd ../..
-  mvn clean package cargo:run -Pdeploywhcl
+  mvn clean package cargo:run -Pdeploywhcl -Drunenv=remote
 
   echo "Copying report to results directory"
   benchmark_version=$(scripts/getBenchmarkVersion.sh)
   result_file="results/Benchmark_$benchmark_version-HCL-IAST.hcl"
-  cp tools/HCL/working/HCL-IAST.hcl "$result_file"
+  cp tools/HCL/HCL-IAST.hcl "$result_file"
   cd tools/HCL
 
 else