enrico.ottonello
/
dnet-hadoop
forked from D-Net/dnet-hadoop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code formatting

This commit is contained in:
Claudio Atzori 2021-02-02 14:38:03 +01:00
parent ac46c247d2
commit 53884d12c2
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/collection/oozie_app/workflow.xml
View File

@ -4,7 +4,6 @@
<name>apiDescription</name> <name>apiDescription</name>
<description>A json encoding of the API Description class</description> <description>A json encoding of the API Description class</description>
</property> </property>
<property> <property>
<name>dataSourceInfo</name> <name>dataSourceInfo</name>
<description>A json encoding of the Datasource Info</description> <description>A json encoding of the Datasource Info</description>
@ -13,50 +12,43 @@
<name>identifierPath</name> <name>identifierPath</name>
<description>An xpath to retrieve the metadata identifier for the generation of DNet Identifier </description> <description>An xpath to retrieve the metadata identifier for the generation of DNet Identifier </description>
</property> </property>
<property> <property>
<name>metadataEncoding</name> <name>metadataEncoding</name>
<description> The type of the metadata XML/JSON</description> <description> The type of the metadata XML/JSON</description>
</property> </property>
<property> <property>
<name>timestamp</name> <name>timestamp</name>
<description>The timestamp of the collection date</description> <description>The timestamp of the collection date</description>
</property> </property>
<property> <property>
<name>workflowId</name> <name>workflowId</name>
<description>The identifier of the workflow</description> <description>The identifier of the workflow</description>
</property> </property>
<property> <property>
<name>mdStoreID</name> <name>mdStoreID</name>
<description>The identifier of the mdStore</description> <description>The identifier of the mdStore</description>
</property> </property>
<property> <property>
<name>mdStoreManagerURI</name> <name>mdStoreManagerURI</name>
<description>The URI of the MDStore Manager</description> <description>The URI of the MDStore Manager</description>
</property> </property>
<property> <property>
<name>collectionMode</name> <name>collectionMode</name>
<description>Should be REFRESH or INCREMENTAL</description> <description>Should be REFRESH or INCREMENTAL</description>
</property> </property>
</parameters> </parameters>
<global> <global>
<job-tracker>${jobTracker}</job-tracker> <job-tracker>${jobTracker}</job-tracker>
<name-node>${nameNode}</name-node> <name-node>${nameNode}</name-node>
</global> </global>
<start to="collection_mode"/> <start to="collection_mode"/>
<kill name="Kill"> <kill name="Kill">
<message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message> <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
</kill> </kill>
<decision name="collection_mode"> <decision name="collection_mode">
<switch> <switch>
<case to="StartTransaction">${wf:conf('collectionMode') eq 'REFRESH'}</case> <case to="StartTransaction">${wf:conf('collectionMode') eq 'REFRESH'}</case>
@ -77,8 +69,6 @@
<error to="Kill"/> <error to="Kill"/>
</action> </action>
<action name="StartTransaction"> <action name="StartTransaction">
<java> <java>
<main-class>eu.dnetlib.dhp.aggregation.mdstore.MDStoreActionNode</main-class> <main-class>eu.dnetlib.dhp.aggregation.mdstore.MDStoreActionNode</main-class>
@ -129,7 +119,6 @@
<error to="FailCollection"/> <error to="FailCollection"/>
</action> </action>
<decision name="collection_mode_end"> <decision name="collection_mode_end">
<switch> <switch>
<case to="CommitVersion">${wf:conf('collectionMode') eq 'REFRESH'}</case> <case to="CommitVersion">${wf:conf('collectionMode') eq 'REFRESH'}</case>
@ -182,8 +171,6 @@
<error to="Kill"/> <error to="Kill"/>
</action> </action>
<action name="RollBack"> <action name="RollBack">
<java> <java>
<main-class>eu.dnetlib.dhp.aggregation.mdstore.MDStoreActionNode</main-class> <main-class>eu.dnetlib.dhp.aggregation.mdstore.MDStoreActionNode</main-class>
@ -195,6 +182,6 @@
<error to="Kill"/> <error to="Kill"/>
</action> </action>
<end name="End"/> <end name="End"/>
</workflow-app> </workflow-app>

9
dhp-workflows/dhp-aggregation/src/main/resources/eu/dnetlib/dhp/transformation/oozie_app/workflow.xml
View File

@ -29,11 +29,10 @@
<name>isLookupUrl</name> <name>isLookupUrl</name>
<description>The IS lookUp service endopoint</description> <description>The IS lookUp service endopoint</description>
</property> </property>
</parameters> </parameters>
<start to="BeginRead"/> <start to="BeginRead"/>
<kill name="Kill"> <kill name="Kill">
<message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message> <message>Action failed, error message[${wf:errorMessage(wf:lastErrorNode())}]</message>
</kill> </kill>
@ -51,11 +50,11 @@
<arg>--mdStoreID</arg><arg>${mdStoreInputId}</arg> <arg>--mdStoreID</arg><arg>${mdStoreInputId}</arg>
<arg>--mdStoreManagerURI</arg><arg>${mdStoreManagerURI}</arg> <arg>--mdStoreManagerURI</arg><arg>${mdStoreManagerURI}</arg>
<capture-output/> <capture-output/>
</java> </java>
<ok to="StartTransaction"/> <ok to="StartTransaction"/>
<error to="Kill"/> <error to="Kill"/>
</action> </action>
<action name="StartTransaction"> <action name="StartTransaction">
<java> <java>
<configuration> <configuration>
@ -69,7 +68,6 @@
<arg>--mdStoreID</arg><arg>${mdStoreOutputId}</arg> <arg>--mdStoreID</arg><arg>${mdStoreOutputId}</arg>
<arg>--mdStoreManagerURI</arg><arg>${mdStoreManagerURI}</arg> <arg>--mdStoreManagerURI</arg><arg>${mdStoreManagerURI}</arg>
<capture-output/> <capture-output/>
</java> </java>
<ok to="TransformJob"/> <ok to="TransformJob"/>
<error to="EndReadRollBack"/> <error to="EndReadRollBack"/>
@ -174,7 +172,6 @@
<error to="Kill"/> <error to="Kill"/>
</action> </action>
<end name="End"/> <end name="End"/>
</workflow-app> </workflow-app>