LMS-2612 some property renaming for proteomics

SVN: 24573

rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-injection/plugin.properties

@@ -2,7 +2,7 @@
 # 'ms-injection' drop box for spectra data
 # ---------------------------------------------------------------------------
 # The directory to watch for incoming data.
-incoming-dir = ${data-dir}/incoming-ms-injection
+incoming-dir = ${incoming-root-dir}/incoming-ms-injection
 
 # Determines when the incoming data should be considered complete and ready to be processed.
 # Allowed values: 

rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-search/plugin.properties

 # ---------------------------------------------------------------------------
 # 'ms-search' drop box for protein data
 # ---------------------------------------------------------------------------
-incoming-dir = ${data-dir}/incoming-ms-search
+incoming-dir = ${incoming-root-dir}/incoming-ms-search
 
 incoming-data-completeness-condition = auto-detection
 

rtd_phosphonetx/dist/etc/service.properties

@@ -7,7 +7,9 @@ host-address = https://localhost
 data-dir = ../data
 
 # The root directory of the data store
-storeroot-dir = ${data}/store
+storeroot-dir = ${data-dir}/store
+
+incoming-root-dir = ${data-dir}
 
 # The directory where the command queue file is located; defaults to storeroot-dir 
 commandqueue-dir =

rtd_phosphonetx/dist/tarball/installer/dss-service.properties

@@ -4,11 +4,10 @@
 
 root-dir = $DSS_ROOT_DIR
 storeroot-dir = ${root-dir}/store
+incoming-root-dir = ${root-dir}
 
 host-address = https://$HOSTNAME
 quiet-period = 10
 check-interval = 5
 
-data-dir = ${root-dir}
-
 core-plugins-folder = ../core-plugins
\ No newline at end of file