Project

General

Profile

« Previous | Next » 

Revision 34696

Added by Marek Horst over 9 years ago

#1133 dropping useless workfing_dir creation for java nodes

View differences:

modules/icm-iis-core/trunk/src/main/scripts/oozie2dot/examples/example_workflow/a_subworkflow/workflow.xml
784 784 
		<java>
785 785 
			<job-tracker>${jobTracker}</job-tracker>
786 786 
			<name-node>${nameNode}</name-node>
787 
			<prepare>
788 
				<delete path="${nameNode}${workingDir}/export-dataset-entities" />
789 
				<mkdir path="${nameNode}${workingDir}/export-dataset-entities" />
790 
			</prepare>
791 787 
			<configuration>
792 788 
				<property>
793 789 
					<name>mapred.job.queue.name</name>
......
840 836 
		<java>
841 837 
			<job-tracker>${jobTracker}</job-tracker>
842 838 
			<name-node>${nameNode}</name-node>
843 
			<prepare>
844 
				<delete path="${nameNode}${workingDir}/export-document-entities" />
845 
				<mkdir path="${nameNode}${workingDir}/export-document-entities" />
846 
			</prepare>
847 839 
			<configuration>
848 840 
				<property>
849 841 
					<name>mapred.job.queue.name</name>
modules/icm-iis-core/trunk/src/main/scripts/oozie2dot/examples/example_workflow/workflow.xml
155 155 
				<property>
156 156 
					<name>output_document_to_project</name>
157 157 
					<!-- referenceextraction_project directory is created at subworkflow prepare phase -->
158 
					<value>${workingDir}/referenceextraction_project/working_dir/document_projects</value>
158 
					<value>${workingDir}/referenceextraction_project/document_projects</value>
159 159 
				</property>
160 160 
            </configuration>
161 161 
        </sub-workflow>
......
170 170 
			<prepare>
171 171 
				<!-- notice: directory have to aligned with skipped action output -->
172 172 
				<delete path="${nameNode}${workingDir}/referenceextraction_project" />
173 
				<mkdir path="${nameNode}${workingDir}/referenceextraction_project/working_dir" />
173 
				<mkdir path="${nameNode}${workingDir}/referenceextraction_project" />
174 174 
			</prepare>
175 175 
            <configuration>
176 176 
                <property>
......
185 185 
				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
186 186 
            <arg>-SworkingDir=${workingDir}/referenceextraction_project/working_dir</arg>
187 187 
            <!-- notice: directory have to aligned with skipped action output -->
188 
            <arg>-Oreferenceextraction_project=${workingDir}/referenceextraction_project/working_dir/document_projects</arg>
188 
            <arg>-Oreferenceextraction_project=${workingDir}/referenceextraction_project/document_projects</arg>
189 189
190 190 
        </java>
191 191 
        <ok to="joining"/>
......
221 221 
				<property>
222 222 
					<name>output_document_to_dataset</name>
223 223 
					<!-- referenceextraction_dataset directory is created at subworkflow prepare phase -->
224 
					<value>${workingDir}/referenceextraction_dataset/working_dir/document_datasets</value>
224 
					<value>${workingDir}/referenceextraction_dataset/document_datasets</value>
225 225 
				</property>
226 226 
            </configuration>
227 227 
        </sub-workflow>
......
236 236 
			<prepare>
237 237 
				<!-- notice: directory have to aligned with skipped action output -->
238 238 
				<delete path="${nameNode}${workingDir}/referenceextraction_dataset" />
239 
				<mkdir path="${nameNode}${workingDir}/referenceextraction_dataset/working_dir" />
239 
				<mkdir path="${nameNode}${workingDir}/referenceextraction_dataset" />
240 240 
			</prepare>
241 241 
            <configuration>
242 242 
                <property>
......
251 251 
				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
252 252 
            <arg>-SworkingDir=${workingDir}/referenceextraction_dataset/working_dir</arg>
253 253 
            <!-- notice: directory have to aligned with skipped action output -->
254 
            <arg>-Oreferenceextraction_dataset=${workingDir}/referenceextraction_dataset/working_dir/document_datasets</arg>
254 
            <arg>-Oreferenceextraction_dataset=${workingDir}/referenceextraction_dataset/document_datasets</arg>
255 255 
        </java>
256 256 
        <ok to="joining"/>
257 257 
        <error to="fail"/>
......
282 282 
				<property>
283 283 
					<name>output_document_to_research_initiative</name>
284 284 
					<!-- referenceextraction_researchinitiative directory is created at subworkflow prepare phase -->
285 
					<value>${workingDir}/referenceextraction_researchinitiative/working_dir/document_researchinitiative</value>
285 
					<value>${workingDir}/referenceextraction_researchinitiative/document_researchinitiative</value>
286 286 
				</property>
287 287 
            </configuration>
288 288 
        </sub-workflow>
......
297 297 
			<prepare>
298 298 
				<!-- notice: directory have to aligned with skipped action output -->
299 299 
				<delete path="${nameNode}${workingDir}/referenceextraction_researchinitiative" />
300 
				<mkdir path="${nameNode}${workingDir}/referenceextraction_researchinitiative/working_dir" />
300 
				<mkdir path="${nameNode}${workingDir}/referenceextraction_researchinitiative" />
301 301 
			</prepare>
302 302 
            <configuration>
303 303 
                <property>
......
312 312 
				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
313 313 
            <arg>-SworkingDir=${workingDir}/referenceextraction_researchinitiative/working_dir</arg>
314 314 
            <!-- notice: directory have to aligned with skipped action output -->
315 
            <arg>-Oreferenceextraction_researchinitiative=${workingDir}/referenceextraction_researchinitiative/working_dir/document_researchinitiative</arg>
315 
            <arg>-Oreferenceextraction_researchinitiative=${workingDir}/referenceextraction_researchinitiative/document_researchinitiative</arg>
316 316 
        </java>
317 317 
        <ok to="joining"/>
318 318 
        <error to="fail"/>
......
400 400 
				</property>
401 401 
				<property>
402 402 
					<name>output_document_to_document_classes</name>
403 
					<value>${workingDir}/documentsclassification_main/working_dir/document_to_document_classes</value>
403 
					<value>${workingDir}/documentsclassification_main/document_to_document_classes</value>
404 404 
				</property>
405 405 
            </configuration>
406 406 
        </sub-workflow>
......
415 415 
			<prepare>
416 416 
				<!-- notice: directory have to aligned with skipped action output -->
417 417 
				<delete path="${nameNode}${workingDir}/documentsclassification_main" />
418 
				<mkdir path="${nameNode}${workingDir}/documentsclassification_main/working_dir" />
418 
				<mkdir path="${nameNode}${workingDir}/documentsclassification_main" />
419 419 
			</prepare>
420 420 
            <configuration>
421 421 
                <property>
......
430 430 
				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
431 431 
            <arg>-SworkingDir=${workingDir}/documentsclassification_main/working_dir</arg>
432 432 
            <!-- notice: directory have to aligned with skipped action output -->
433 
            <arg>-Odocumentsclassification=${workingDir}/documentsclassification_main/working_dir/document_to_document_classes</arg>
433 
            <arg>-Odocumentsclassification=${workingDir}/documentsclassification_main/document_to_document_classes</arg>
434 434 
        </java>
435 435 
        <ok to="joining-transformers_metadatamerger_based"/>
436 436 
        <error to="fail"/>
......
515 515 
				<!-- notice: directory have to aligned with skipped action output -->
516 516 
				<delete path="${nameNode}${workingDir}/documentssimilarity_chain" />
517 517 
				<delete path="${nameNode}${output_document_similarity}" />
518 
				<mkdir path="${nameNode}${workingDir}/documentssimilarity_chain/working_dir" />
518 
				<mkdir path="${nameNode}${workingDir}/documentssimilarity_chain" />
519 519 
				<mkdir path="${nameNode}${output_document_similarity}" />
520 520 
			</prepare>
521 521 
            <configuration>
......
588 588 
				</property>
589 589 
				<property>
590 590 
					<name>output</name>
591 
					<value>${workingDir}/citationmatching_chain/working_dir/citation</value>
591 
					<value>${workingDir}/citationmatching_chain/citation</value>
592 592 
				</property>
593 593 
				<property>
594 594 
            		<name>cit_genAuthorIdxJavaOpts</name>
......
607 607 
			<prepare>
608 608 
				<!-- notice: directory have to aligned with skipped action output -->
609 609 
				<delete path="${nameNode}${workingDir}/citationmatching_chain" />
610 
				<mkdir path="${nameNode}${workingDir}/citationmatching_chain/working_dir" />
610 
				<mkdir path="${nameNode}${workingDir}/citationmatching_chain" />
611 611 
			</prepare>
612 612 
            <configuration>
613 613 
                <property>
......
622 622 
				eu/dnetlib/iis/mainworkflows/data/empty.json}</arg>
623 623 
            <arg>-SworkingDir=${workingDir}/citationmatching_chain/working_dir</arg>
624 624 
            <!-- notice: directory have to aligned with skipped action output -->
625 
            <arg>-Ocitation=${workingDir}/citationmatching_chain/working_dir/citation</arg>
625 
            <arg>-Ocitation=${workingDir}/citationmatching_chain/citation</arg>
626 626 
        </java>
627 627 
        <ok to="decision-statistics"/>
628 628 
        <error to="fail"/>
......
652 652 
				</property>
653 653 
				<property>
654 654 
					<name>input_citation</name>
655 
					<value>${workingDir}/citationmatching_chain/working_dir/citation</value>
655 
					<value>${workingDir}/citationmatching_chain/citation</value>
656 656 
				</property>
657 657 
				<property>
658 658 
					<!-- NOTICE: reference extraction will have to be enabled to get this input -->
659 659 
					<name>input_document_to_project</name>
660 
					<value>${workingDir}/referenceextraction_project/working_dir/document_projects</value>
660 
					<value>${workingDir}/referenceextraction_project/document_projects</value>
661 661 
				</property>
662 662 
				<property>
663 663 
					<name>input_person</name>
......
708 708 
				</property>
709 709 
				<property>
710 710 
					<name>output_document_statistics</name>
711 
					<value>${workingDir}/statistics/working_dir/document_statistics</value>
711 
					<value>${workingDir}/statistics/document_statistics</value>
712 712 
				</property>
713 713 
				<property>
714 714 
					<name>output_author_statistics</name>
......
735 735 
			<prepare>
736 736 
				<!-- notice: directory have to aligned with skipped action output -->
737 737 
				<delete path="${nameNode}${workingDir}/statistics" />
738 
				<mkdir path="${nameNode}${workingDir}/statistics/working_dir" />
738 
				<mkdir path="${nameNode}${workingDir}/statistics" />
739 739 
			</prepare>
740 740 
            <configuration>
741 741 
                <property>
......
762 762 
			-->
763 763 
            <arg>-SworkingDir=${workingDir}/${nameNode}${workingDir}/statistics/working_dir</arg>
764 764 
            <!-- notice: directory have to aligned with skipped action output -->
765 
            <arg>-Odocument_statistics=${workingDir}/statistics/working_dir/document_statistics</arg>
765 
            <arg>-Odocument_statistics=${workingDir}/statistics/document_statistics</arg>
766 766 
            <arg>-Oauthor_statistics=${workingDir}/statistics/working_dir/author_statistics</arg>
767 767 
            <arg>-Oproject_statistics=${output_project_statistics}</arg>
768 768 
            <!-- FIXME currently global statistics are not available -->
......
835 835 
				</property>
836 836 
				<property>
837 837 
					<name>input_document_to_project</name>
838 
					<value>${workingDir}/referenceextraction_project/working_dir/document_projects</value>
838 
					<value>${workingDir}/referenceextraction_project/document_projects</value>
839 839 
				</property>
840 840 
				<property>
841 841 
					<name>input_document_to_dataset</name>
842 
					<value>${workingDir}/referenceextraction_dataset/working_dir/document_datasets</value>
842 
					<value>${workingDir}/referenceextraction_dataset/document_datasets</value>
843 843 
				</property>
844 844 
				<property>
845 845 
                    <name>input_document_to_research_initiative</name>
846 
                    <value>${workingDir}/referenceextraction_researchinitiative/working_dir/document_researchinitiative</value>
846 
                    <value>${workingDir}/referenceextraction_researchinitiative/document_researchinitiative</value>
847 847 
                </property>
848 848 
				<property>
849 849 
					<name>input_document_to_document_classes</name>
850 
					<value>${workingDir}/documentsclassification_main/working_dir/document_to_document_classes</value>
850 
					<value>${workingDir}/documentsclassification_main/document_to_document_classes</value>
851 851 
				</property>
852 852 
				<property>
853 853 
					<name>input_citation</name>
854 
					<value>${workingDir}/citationmatching_chain/working_dir/citation</value>
854 
					<value>${workingDir}/citationmatching_chain/citation</value>
855 855 
				</property>
856 856 
				<property>
857 857 
					<name>input_document_to_document_statistics</name>
858 
					<value>${workingDir}/statistics/working_dir/document_statistics</value>
858 
					<value>${workingDir}/statistics/document_statistics</value>
859 859 
				</property>
860 860 
				<!-- fake input datastores -->
861 861 
				<property>

Also available in: Unified diff