Also use regular jar for Kieker execution

benchmark/build.gradle

@@ -37,5 +37,10 @@ jar {
 		    into "../frameworks/inspectIT/"
 		    rename('benchmark.jar', 'MooBench.jar')
 	    }
+	    copy {
+		    from jar
+		    into "../frameworks/Kieker/"
+		    rename('benchmark.jar', 'MooBench.jar')
+	    }
 	}
 }

frameworks/Kieker/scripts/benchmark.sh

@@ -51,7 +51,6 @@ checkDirectory DATA_DIR "${DATA_DIR}" create
 PARENT=`dirname "${RESULTS_DIR}"`
 checkDirectory result-base "$PARENT"
 checkFile ApsectJ-Agent "${AGENT}"
-checkFile moobench "${BENCHMARK}"
 
 information "----------------------------------"
 information "Running benchmark..."
@@ -138,10 +137,10 @@ function execute-experiment() {
        BENCHMARK_OPTS="${JAVA_ARGS} ${LTW_ARGS} ${KIEKER_ARGS} ${kieker_parameters}"
     fi
     
-    echo ${BENCHMARK}" "${BENCHMARK_OPTS}" moobench.benchmark.BenchmarkMain"
+    echo ${BENCHMARK_OPTS}" -jar benchmark/build/libs/benchmark.jar"
 
-    ${BENCHMARK} ${BENCHMARK_OPTS} moobench.benchmark.BenchmarkMain \
-    	--application moobench.application.MonitoredClassSimple \
+    ${JAVABIN}java ${BENCHMARK_OPTS} -jar benchmark/build/libs/benchmark.jar \
+	--application moobench.application.MonitoredClassSimple \
         --output-filename ${RAWFN}-${loop}-${recursion}-${index}.csv \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
         --method-time ${METHOD_TIME} \

frameworks/Kieker/scripts/config

@@ -8,7 +8,6 @@ RSCRIPT_PATH="../../stats.csv.r"
 
 DATA_DIR="${BASE_DIR}/data"
 AGENT="${BASE_DIR}/kieker-1.15-SNAPSHOT-aspectj.jar"
-BENCHMARK="${BASE_DIR}/benchmark/bin/benchmark"
 
 BATCH_MODE="yes"
 

frameworks/inspectIT/benchmark.sh

@@ -151,6 +151,4 @@ run-r
 
 ## Clean up raw results
 zip -jqr ${RESULTS_DIR}/results.zip ${RAWFN}*
-rm -f ${RAWFN}*
-[ -f ${BASE_DIR}nohup.out ] && cp ${BASE_DIR}nohup.out ${RESULTS_DIR}
-[ -f ${BASE_DIR}nohup.out ] && > ${BASE_DIR}nohup.out
+rm ${RAWFN}*