fixed the jar inside directory problem!

recipegrace · Sep 25, 2018 · 6605627 · 6605627
1 parent f9555bc
commit 6605627
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/resources/templates/run-jar.ssp b/src/main/resources/templates/run-jar.ssp
@@ -6,10 +6,10 @@
 <%@ val location:String = evalObject.evaluateVariable(javaJob.javaJob.jarLocation,localVariables).toString%>
 <%@ val mainClass:String = evalObject.evaluateVariable(javaJob.javaJob.mainClass,localVariables).toString%>
 <%@ val bucket:String = location.substring(5).split("/").head %>
-<%@ val objectName:String = location.substring(5).split("/").drop(1).mkString("/") %>
+<%@ val jarName:String = location.substring(5).split("/").last %>
 <%@ var name: String%>
 <%@ var command1:String = s"gsutil -m cp -r ${location} ."%>
-<%@ var command2:String = s"java -cp ${objectName} ${mainClass} ${ javaJob.javaJob.args.get.map(f=> evalObject.evaluateVariable(f,localVariables )).mkString(" ")}"%>
+<%@ var command2:String = s"java -cp ${jarName} ${mainClass} ${ javaJob.javaJob.args.get.map(f=> evalObject.evaluateVariable(f,localVariables )).mkString(" ")}"%>
 
   ${name} = bash_operator.BashOperator(
    task_id='run_jar_${name}',

diff --git a/src/test/scala/com/recipegrace/bbc/WorkflowsFromFilesTest.scala b/src/test/scala/com/recipegrace/bbc/WorkflowsFromFilesTest.scala
@@ -26,7 +26,7 @@ class WorkflowsFromFilesTest extends BaseWorkflowTest {
 
     main.errorMessage shouldBe ""
     main.generateFlows.clusterStore.running shouldBe List()
-    //println(content.get)
+    println(content.get)
     //val writer = new FileWriter(".tests/output.txt")
     //writer.append(content.get)
     //writer.close()