From 3ff610bd6fa791d8f057382def6bb49d4045cf58 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 28 May 2014 11:18:00 +0000
Subject: [PATCH] Fix a bug in NotifyingTask. The bug prevented the usage of
 properties in template definitions since r24610 (2012-03-05) when default
 values for property variable were introduced in ExtendedProperties.

SVN: 31613
---
 .../cisd/etlserver/postregistration/NotifyingTask.java        | 4 ++--
 .../postregistration/NotifyingTaskTest-Example.properties     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
index 2573d5108e2..2afafac1457 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTask.java
@@ -39,7 +39,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty;
  * message. Template place holders have the form <code>${<i>&lt;place holder name&gt;</i>}</code>.
  * The place holder name for the data set code is <code>data-set-code</code>. To refer a data set
  * property the place holder name has the form
- * <code>property:<i>&lt;property type code (ignoring case)&gt;></code>.
+ * <code>property.<i>&lt;property type code (ignoring case)&gt;></code>.
  * 
  * @author Franz-Josef Elmer
  */
@@ -55,7 +55,7 @@ public class NotifyingTask extends AbstractPostRegistrationTask
      */
     private static final String INCLUDE_DATASET_TYPES_PATTERN = "include-dataset-type-patterns";
 
-    private static final String PROPERTY_PREFIX = "property:";
+    private static final String PROPERTY_PREFIX = "property.";
 
     private static final String DATA_SET_CODE_PLACE_HOLDER = "data-set-code";
 
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest-Example.properties b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest-Example.properties
index 737cb0a75e1..3affa0eefb7 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest-Example.properties
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/postregistration/NotifyingTaskTest-Example.properties
@@ -1,5 +1,5 @@
 message-template = storage_provider.storage.status = STORAGE_SUCCESSFUL\n\
                    storage_provider.dataset.id = ${data-set-code}\n\
-                   ibrain2.dataset.id = ${property:ibrain-data-set-id}\n
-destination-path-template = targets/ibrain-${property:ibrain-data-set-id}.txt
+                   ibrain2.dataset.id = ${property.ibrain-data-set-id}\n
+destination-path-template = targets/ibrain-${property.ibrain-data-set-id}.txt
 include-dataset-type-patterns = .*XYZ.*, accepted-type
-- 
GitLab