Index: hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf =================================================================== --- hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf (revision 1548387) +++ hcatalog/src/test/e2e/templeton/tests/jobsubmission.conf (working copy) @@ -67,7 +67,7 @@ 'method' => 'POST', 'url' => ':TEMPLETON_URL:/templeton/v1/mapreduce/jar', 'post_options' => ['user.name=:UNAME:','arg=:INPDIR_HDFS:/nums.txt', 'arg= :OUTDIR:/wc.txt', - 'jar=:INPDIR_HDFS:/hexamples.jar', 'class=wordcount', ], + 'jar=:INPDIR_HDFS:/hexamples.jar', 'class=wordcount', 'define=MYPROP1=VALUE1', 'define=MYPROP2=VALUE2',], 'json_field_substr_match' => { 'id' => '\d+'}, #results 'status_code' => 200, Index: hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java =================================================================== --- hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java (revision 1548387) +++ hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/JarDelegator.java (working copy) @@ -94,12 +94,13 @@ args.add("-files"); args.add(TempletonUtils.quoteForWindows(filesListAsString)); } - //the token file location comes after mainClass, as a -Dprop=val - args.add("-D" + TempletonControllerJob.TOKEN_FILE_ARG_PLACEHOLDER); + //the token file location comes after mainClass, as a -D prop=val + args.add("-D"); + args.add(TempletonControllerJob.TOKEN_FILE_ARG_PLACEHOLDER); for (String d : defines) { args.add("-D"); - TempletonUtils.quoteForWindows(d); + args.add(TempletonUtils.quoteForWindows(d)); } for (String arg : jarArgs) { args.add(TempletonUtils.quoteForWindows(arg));