Project

General

Profile

« Previous | Next » 

Revision 39164

Added by Marek Horst over 8 years ago

merging trunk changes with IIS-CDH-5.3.0 branch

View differences:

workflow.xml
201 201
					<value>${workingDir}/transformers_metadataextraction_skip_extracted/tobeprocessed_content</value>
202 202
				</property>
203 203
				<property>
204
					<name>excluded_ids</name>
205
					<value>${excluded_ids}</value>
206
				</property>
207
				<property>
208
					<name>max_file_size_mb</name>
209
					<value>${max_file_size_mb}</value>
210
				</property>
211
				<property>
212
				    <name>content_connection_timeout</name>
213
				   <value>${content_connection_timeout}</value>
214
				</property>
215
				<property>
216
				    <name>content_read_timeout</name>
217
				   <value>${content_read_timeout}</value>
218
				</property>
219
				<property>
220
					<name>mapred_max_split_size</name>
221
					<value>${mapred_max_split_size}</value>
222
				</property>
223
				<property>
224
					<name>output_name_meta</name>
225
					<value>${output_name_meta}</value>
226
				</property>
227
				<property>
228
					<name>output_name_plaintext</name>
229
					<value>${output_name_plaintext}</value>
230
				</property>
231
				<property>
232
					<name>output_name_fault</name>
233
					<value>${output_name_fault}</value>
234
				</property>
235
				<property>
236 204
					<name>output_root</name>
237 205
					<value>${workingDir}/metadata_extractor/output_root</value>
238 206
				</property>
207
				<!-- all the other properties are autmatically propagated-->
239 208
            </configuration>
240 209
        </sub-workflow>
241 210
		<ok to="merge_outputs"/>
......
482 451
                    <name>workingDir</name>
483 452
                    <value>${workingDir}/metadata_extractor/working_dir</value>
484 453
                </property>
485
            	<property>
486
					<name>input</name>
487
					<value>${input}</value>
488
				</property>
489
				<property>
490
					<name>excluded_ids</name>
491
					<value>${excluded_ids}</value>
492
				</property>
493
				<property>
494
					<name>max_file_size_mb</name>
495
					<value>${max_file_size_mb}</value>
496
				</property>
497
				<property>
498
				    <name>content_connection_timeout</name>
499
				   <value>${content_connection_timeout}</value>
500
				</property>
501
				<property>
502
				    <name>content_read_timeout</name>
503
				   <value>${content_read_timeout}</value>
504
				</property>
505
				<property>
506
					<name>mapred_max_split_size</name>
507
					<value>${mapred_max_split_size}</value>
508
				</property>
509
				<property>
510
					<name>output_name_meta</name>
511
					<value>${output_name_meta}</value>
512
				</property>
513
				<property>
514
					<name>output_name_plaintext</name>
515
					<value>${output_name_plaintext}</value>
516
				</property>
517
				<property>
518
					<name>output_name_fault</name>
519
					<value>${output_name_fault}</value>
520
				</property>
521
				<property>
522
					<name>output_root</name>
523
					<value>${output_root}</value>
524
				</property>
454
				<!-- all the other properties are autmatically propagated-->
525 455
            </configuration>
526 456
        </sub-workflow>
527 457
		<ok to="obtain-lock_for_initializing"/>

Also available in: Unified diff