From 7df639f5f8eaa63453c3570674097b695d383b09 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Fri, 24 Feb 2012 12:55:19 +0000
Subject: [PATCH] LMS-2612 some property renaming for proteomics
SVN: 24573
---
.../1/dss/drop-boxes/ms-injection/plugin.properties | 2 +-
.../proteomics/1/dss/drop-boxes/ms-search/plugin.properties | 2 +-
rtd_phosphonetx/dist/etc/service.properties | 4 +++-
rtd_phosphonetx/dist/tarball/installer/dss-service.properties | 3 +--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-injection/plugin.properties b/rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-injection/plugin.properties
index ffa87055621..58a6f77f4ed 100644
--- a/rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-injection/plugin.properties
+++ b/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:
diff --git a/rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-search/plugin.properties b/rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-search/plugin.properties
index 7773492161f..b39ac151edb 100644
--- a/rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-search/plugin.properties
+++ b/rtd_phosphonetx/dist/core-plugins/proteomics/1/dss/drop-boxes/ms-search/plugin.properties
@@ -1,7 +1,7 @@
# ---------------------------------------------------------------------------
# '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
diff --git a/rtd_phosphonetx/dist/etc/service.properties b/rtd_phosphonetx/dist/etc/service.properties
index c09174beed1..61f0f91828a 100644
--- a/rtd_phosphonetx/dist/etc/service.properties
+++ b/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 =
diff --git a/rtd_phosphonetx/dist/tarball/installer/dss-service.properties b/rtd_phosphonetx/dist/tarball/installer/dss-service.properties
index 1a9fcc16137..3aef05287ba 100644
--- a/rtd_phosphonetx/dist/tarball/installer/dss-service.properties
+++ b/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
--
GitLab