From 5153d88bd34f9ea14142955f62d6c0e1a0ab9bb0 Mon Sep 17 00:00:00 2001
From: "miriam.baglioni" <miriam.baglioni@isti.cnr.it>
Date: Thu, 23 Apr 2020 11:04:53 +0200
Subject: [PATCH] defiition of workflow and properties for bulktagging

---
 .../dhp/{ => bulktag}/input_bulkTag_parameters.json  |  0
 .../dhp/{ => bulktag}/oozie_app/config-default.xml   |  0
 .../dnetlib/dhp/{ => bulktag}/oozie_app/workflow.xml | 12 ++++++------
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/{ => bulktag}/input_bulkTag_parameters.json (100%)
 rename dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/{ => bulktag}/oozie_app/config-default.xml (100%)
 rename dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/{ => bulktag}/oozie_app/workflow.xml (96%)

diff --git a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/input_bulkTag_parameters.json b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/input_bulkTag_parameters.json
similarity index 100%
rename from dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/input_bulkTag_parameters.json
rename to dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/input_bulkTag_parameters.json
diff --git a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/oozie_app/config-default.xml b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/config-default.xml
similarity index 100%
rename from dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/oozie_app/config-default.xml
rename to dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/config-default.xml
diff --git a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/oozie_app/workflow.xml b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/workflow.xml
similarity index 96%
rename from dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/oozie_app/workflow.xml
rename to dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/workflow.xml
index b4f918bbd..390311846 100644
--- a/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/oozie_app/workflow.xml
+++ b/dhp-workflows/dhp-bulktag/src/main/resources/eu/dnetlib/dhp/bulktag/oozie_app/workflow.xml
@@ -55,12 +55,12 @@
         <error to="Kill"/>
     </action>
 
-<action name="fork_exec_bulktag">
+<fork name="fork_exec_bulktag">
     <path start="join_bulktag_publication"/>
     <path start="join_bulktag_dataset"/>
     <path start="join_bulktag_otherresearchproduct"/>
     <path start="join_bulktag_software"/>
-</action>
+</fork>
     <action name="join_bulktag_publication">
         <spark xmlns="uri:oozie:spark-action:0.2">
             <job-tracker>${jobTracker}</job-tracker>
@@ -84,7 +84,7 @@
             <!--        <arg>&#45;&#45;hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>-->
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.Publication</arg>
             <arg>--outputPath</arg><arg>${workingDir}/publication</arg>
-            <arg>--proto_map</arg><arg>${protoMap}</arg>
+            <arg>--protoMap</arg><arg>${protoMap}</arg>
             <arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg>
         </spark>
         <ok to="wait"/>
@@ -113,7 +113,7 @@
             <!--        <arg>&#45;&#45;hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>-->
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.Dataset</arg>
             <arg>--outputPath</arg><arg>${workingDir}/dataset</arg>
-            <arg>--proto_map</arg><arg>${protoMap}</arg>
+            <arg>--protoMap</arg><arg>${protoMap}</arg>
             <arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg>
         </spark>
         <ok to="wait"/>
@@ -142,7 +142,7 @@
             <!--        <arg>&#45;&#45;hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>-->
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.OtherResearchProduct</arg>
             <arg>--outputPath</arg><arg>${workingDir}/otherresearchproduct</arg>
-            <arg>--proto_map</arg><arg>${protoMap}</arg>
+            <arg>--protoMap</arg><arg>${protoMap}</arg>
             <arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg>
         </spark>
         <ok to="wait"/>
@@ -171,7 +171,7 @@
             <!--        <arg>&#45;&#45;hive_metastore_uris</arg><arg>${hive_metastore_uris}</arg>-->
             <arg>--resultTableName</arg><arg>eu.dnetlib.dhp.schema.oaf.Software</arg>
             <arg>--outputPath</arg><arg>${workingDir}/software</arg>
-            <arg>--proto_map</arg><arg>${protoMap}</arg>
+            <arg>--protoMap</arg><arg>${protoMap}</arg>
             <arg>--isLookupUrl</arg><arg>${isLookupUrl}</arg>
         </spark>
         <ok to="wait"/>