From 34a0964e6cf9ccfbc680f7c8b1c34c10160d195c Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 24 Apr 2009 07:41:13 +0000
Subject: [PATCH] LMS-834 fix incorrect DSS service.properties keys which
configure properties file for datasets
SVN: 10789
---
datastore_server/dist/etc/service.properties | 4 ++--
datastore_server/etc/service.properties | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/datastore_server/dist/etc/service.properties b/datastore_server/dist/etc/service.properties
index 487dfa5de25..e7fe68c29c1 100644
--- a/datastore_server/dist/etc/service.properties
+++ b/datastore_server/dist/etc/service.properties
@@ -102,6 +102,8 @@ main-thread.incoming-data-completeness-condition = marker-file
main-thread.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
# Separator used to extract the barcode in the data set file name
main-thread.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
+# Location of file containing data set properties
+#main-thread.data-set-info-extractor.data-set-properties-file-name = data-set.properties
# The extractor class to use for type extraction
main-thread.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
@@ -109,8 +111,6 @@ main-thread.type-extractor.file-format-type = TIFF
main-thread.type-extractor.locator-type = RELATIVE_LOCATION
main-thread.type-extractor.data-set-type = HCS_IMAGE
main-thread.type-extractor.is-measured = true
-# Location of file containing data set properties
-#main-thread.type-extractor.data-set-properties-file = etc/data-set.properties
# The storage processor (IStorageProcessor implementation)
main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
diff --git a/datastore_server/etc/service.properties b/datastore_server/etc/service.properties
index 8e890e0101c..79d42caab14 100644
--- a/datastore_server/etc/service.properties
+++ b/datastore_server/etc/service.properties
@@ -100,13 +100,13 @@ main-thread.incoming-dir.format =
main-thread.data-set-info-extractor = ch.systemsx.cisd.etlserver.DefaultDataSetInfoExtractor
# Separator used to extract the barcode in the data set file name
main-thread.data-set-info-extractor.entity-separator = ${data-set-file-name-entity-separator}
+# Location of file containing data set properties
+#main-thread.data-set-info-extractor.data-set-properties-file-name = data-set.properties
main-thread.type-extractor = ch.systemsx.cisd.etlserver.SimpleTypeExtractor
main-thread.type-extractor.file-format-type = TIFF
main-thread.type-extractor.locator-type = RELATIVE_LOCATION
main-thread.type-extractor.data-set-type = HCS_IMAGE
-# Location of file containing data set properties
-#main-thread.type-extractor.data-set-properties-file = etc/data-set.properties
# The storage processor (IStorageProcessor implementation)
#main-thread.storage-processor = ch.systemsx.cisd.etlserver.DefaultStorageProcessor
--
GitLab