Fix the scripts and pom in streaming bench

Author: carsonwang

bin/workloads/streaming/wordcount/flink/run.sh

@@ -25,7 +25,7 @@ show_bannar start
 
 START_TIME=`timestamp`
 printFullLog
-run-flink-job -c com.intel.flinkbench.RunBench
+run-flink-job -c com.intel.hibench.flinkbench.RunBench
 END_TIME=`timestamp`
 
 gen_report ${START_TIME} ${END_TIME} 0

bin/workloads/streaming/wordcount/gearpump/run.sh

@@ -14,18 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-workload_folder=`dirname "$0"`
-workload_folder=`cd "$workload_folder"; pwd`
-workload_root=${workload_folder}/../..
-echo $workload_root
-. "${workload_root}/../../bin/functions/load-bench-config.sh"
+current_dir=`dirname "$0"`
+current_dir=`cd "$current_dir"; pwd`
+root_dir=${current_dir}/../../../../..
+workload_config=${root_dir}/conf/workloads/streaming/wordcount.conf
+. "${root_dir}/bin/functions/load-bench-config.sh"
 
-enter_bench GearpumpWordcount ${workload_root} ${workload_folder}
+enter_bench GearpumpWordcount ${workload_config} ${current_dir}
 show_bannar start
 
 START_TIME=`timestamp`
 printFullLog
-run-gearpump-app com.intel.hibench.streambench.gearpump.RunBench ${SPARKBENCH_PROPERTIES_FILES}
+run-gearpump-app com.intel.hibench.gearpumpbench.RunBench ${SPARKBENCH_PROPERTIES_FILES}
 END_TIME=`timestamp`
 
 gen_report ${START_TIME} ${END_TIME} 0

bin/workloads/streaming/wordcount/storm/run.sh

@@ -14,18 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-workload_folder=`dirname "$0"`
-workload_folder=`cd "$workload_folder"; pwd`
-workload_root=${workload_folder}/../..
-echo "workload root: " + $workload_root
-. "${workload_root}/../../bin/functions/load-bench-config.sh"
+current_dir=`dirname "$0"`
+current_dir=`cd "$current_dir"; pwd`
+root_dir=${current_dir}/../../../../..
+workload_config=${root_dir}/conf/workloads/streaming/wordcount.conf
+. "${root_dir}/bin/functions/load-bench-config.sh"
 
-enter_bench StormWordcount ${workload_root} ${workload_folder}
+enter_bench StormWordcount ${workload_config} ${current_dir}
 show_bannar start
 
 START_TIME=`timestamp`
 printFullLog
-run-storm-job com.intel.hibench.streambench.storm.RunBench ${SPARKBENCH_PROPERTIES_FILES} storm
+run-storm-job com.intel.hibench.stormbench.RunBench ${SPARKBENCH_PROPERTIES_FILES} storm
 END_TIME=`timestamp`
 
 gen_report ${START_TIME} ${END_TIME} 0

bin/workloads/streaming/wordcount/trident/run.sh

@@ -14,18 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-workload_folder=`dirname "$0"`
-workload_folder=`cd "$workload_folder"; pwd`
-workload_root=${workload_folder}/../..
-echo $workload_root
-. "${workload_root}/../../bin/functions/load-bench-config.sh"
+current_dir=`dirname "$0"`
+current_dir=`cd "$current_dir"; pwd`
+root_dir=${current_dir}/../../../../..
+workload_config=${root_dir}/conf/workloads/streaming/wordcount.conf
+. "${root_dir}/bin/functions/load-bench-config.sh"
 
-enter_bench StormTridentWordcount ${workload_root} ${workload_folder}
+enter_bench StormTridentWordcount ${workload_config} ${current_dir}
 show_bannar start
 
 START_TIME=`timestamp`
 printFullLog
-run-storm-job com.intel.hibench.streambench.storm.RunBench ${SPARKBENCH_PROPERTIES_FILES} trident
+run-storm-job com.intel.hibench.stormbench.RunBench ${SPARKBENCH_PROPERTIES_FILES} trident
 END_TIME=`timestamp`
 
 gen_report ${START_TIME} ${END_TIME} 0

pom.xml

@@ -39,11 +39,6 @@
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-library</artifactId>
-      <version>${scala.version}</version>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>