SSDM-1366: renaming property 'data-set-types-with-no-experiment' to...

SSDM-1366: renaming property 'data-set-types-with-no-experiment' to 'data-set-types-with-no-experiment-needed'. Adding property to template service.properties file.

SVN: 33563

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/util/DataSetTypeWithoutExperimentChecker.java

@@ -33,11 +33,13 @@ import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
  */
 public class DataSetTypeWithoutExperimentChecker
 {
+    public static final String PROPERTY_KEY = "data-set-types-with-no-experiment-needed";
+    
     private List<Pattern> patternsForDataSetTypesWithoutExperiment = new ArrayList<Pattern>();
     
     public DataSetTypeWithoutExperimentChecker(Properties properties)
     {
-        String regularExpressions = properties.getProperty("data-set-types-with-no-experiment");
+        String regularExpressions = properties.getProperty(PROPERTY_KEY);
         if (StringUtils.isNotBlank(regularExpressions))
         {
             String[] splittedRegexes = regularExpressions.split(",");
@@ -49,7 +51,7 @@ public class DataSetTypeWithoutExperimentChecker
                 } catch (PatternSyntaxException ex)
                 {
                     throw new ConfigurationFailureException("Invalid regular expression in property "
-                            + "'data-set-types-with-no-experiment': " + regex, ex);
+                            + "'" + PROPERTY_KEY + "': " + regex, ex);
                 }
             }
         }

openbis/source/java/service.properties

@@ -11,7 +11,7 @@ script-folder = ./source/
 
 core-plugins-folder = source/core-plugins
 
-data-set-types-with-no-experiment = .*
+data-set-types-with-no-experiment-needed = .*
 
 # Supported: currently only 'postgresql' is supported
 database.engine = postgresql

openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java

@@ -39,6 +39,7 @@ import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider;
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientService;
 import ch.systemsx.cisd.openbis.generic.server.ICommonServerForInternalUse;
 import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService;
+import ch.systemsx.cisd.openbis.generic.server.business.bo.util.DataSetTypeWithoutExperimentChecker;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IndexMode;
 import ch.systemsx.cisd.openbis.generic.shared.IServiceForDataStoreServer;
@@ -145,7 +146,7 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT
         System.setProperty("hibernate.search.index-mode", IndexMode.INDEX_FROM_SCRATCH.name());
         System.setProperty("hibernate.search.index-base", "../openbis/targets/lucene/cleandb");
         System.setProperty("hibernate.search.worker.execution", "sync");
-        System.setProperty("data-set-types-with-no-experiment", "  NO-EXP-.* ,   NEXP-.*  ");
+        System.setProperty(DataSetTypeWithoutExperimentChecker.PROPERTY_KEY, "  NO-EXP-.* ,   NEXP-.*  ");
     }
 
     private void setContext() throws Exception

openbis_standard_technologies/dist/server/service.properties

@@ -150,6 +150,10 @@ session-timeout = 720
 # Regardless of the value of this property no white spaces are allowed in the material codes.
 #material-relax-code-constraints=false
 
+# Comma-separated list of regular expression of data set types which do not require that is linked
+# to an experiment. Instead a link to a sample with space is required.
+data-set-types-with-no-experiment-needed = .*
+
 # ---------------------------------------------------------------------------
 # CIFEX connection configuration.
 # ---------------------------------------------------------------------------

screening/source/java/service.properties

@@ -12,6 +12,9 @@ core-plugins-folder=../screening/source/core-plugins
 
 script-folders = source/sql, ../openbis/source/sql
 
+data-set-types-with-no-experiment-needed = .*
+
+
 # Supported: currently only 'postgresql' is supported
 database.engine = postgresql
 database.create-from-scratch = false