LMS-142 replace code extractors by data set info extractors

SVN: 5190

integration-tests/run.sh

@@ -547,7 +547,7 @@ function assert_empty_in_out_folders {
 function assert_correct_content_of_processing_dir {
     echo ==== assert correct content of processing-dir ====
     
-    local data_set=$DATA/processing-dir/microX_200801011213_3VCP1
+    local data_set=$DATA/processing-dir/microX-3VCP1_microX_200801011213_3VCP1
     assert_same_content $TEST_DATA/3VCP1 $data_set
     assert_same_content $TEMPLATE/openBIS-client/testdata/register-experiments/processing-parameters.txt \
                         $DATA/processing-dir/processing-parameters-from-openbis

integration-tests/templates/etlserver-all/etc/service.properties

@@ -48,15 +48,15 @@ inputs=raw-data,image-analysis
 # The directory to watch for incoming data.
 raw-data.incoming-dir = ../data/out-raw
 
-# The extractor plugin class to use for code extraction
-raw-data.code-extractor = ch.systemsx.cisd.etlserver.threev.CodeExtractorForDataAcquisition
+# The extractor plugin class to use for data set information extraction
+raw-data.data-set-info-extractor = ch.systemsx.cisd.etlserver.threev.DataSetInfoExtractorForDataAcquisition
 # Separator used to extract the barcode in the data set file name
-raw-data.code-extractor.entity-separator = ${date-set-file-name-entity-separator}
-raw-data.code-extractor.index-of-data-producer-code = 0
-raw-data.code-extractor.index-of-data-production-date = 1
-raw-data.code-extractor.data-production-date-format = yyyyMMddHHmm
-raw-data.code-extractor.indices-of-data-set-code-entities = 0 1
-raw-data.code-extractor.data-set-code-entities-glue = -
+raw-data.data-set-info-extractor.entity-separator = ${date-set-file-name-entity-separator}
+raw-data.data-set-info-extractor.index-of-data-producer-code = 0
+raw-data.data-set-info-extractor.index-of-data-production-date = 1
+raw-data.data-set-info-extractor.data-production-date-format = yyyyMMddHHmm
+raw-data.data-set-info-extractor.indices-of-data-set-code-entities = 0 -1
+raw-data.data-set-info-extractor.data-set-code-entities-glue = -
 # ...........................................................................
 
 # The extractor plugin class to use for type extraction
@@ -87,11 +87,11 @@ raw-data.post-processor-factory = ch.systemsx.cisd.etlserver.DummyPostProcessorF
 # ---------------------------------------------------------------------------
 image-analysis.incoming-dir = ../data/out-analys
 
-image-analysis.code-extractor = ch.systemsx.cisd.etlserver.threev.CodeExtractorForImageAnalysis
+image-analysis.data-set-info-extractor = ch.systemsx.cisd.etlserver.threev.DataSetInfoExtractorForImageAnalysis
 # Separator used to extract the barcode in the data set file name
-image-analysis.code-extractor.entity-separator = ${date-set-file-name-entity-separator}
-image-analysis.code-extractor.indices-of-parent-data-set-code-entities = 0 1
-image-analysis.code-extractor.data-set-code-entities-glue = -
+image-analysis.data-set-info-extractor.entity-separator = ${date-set-file-name-entity-separator}
+image-analysis.data-set-info-extractor.indices-of-parent-data-set-code-entities = 0 -1
+image-analysis.data-set-info-extractor.data-set-code-entities-glue = -
 # ...........................................................................
 
 # The extractor class to use for type extraction