Merge branch 'master' of sissource.ethz.ch:sispub/openbis

js-test/servers/common/openBIS-server/etc/service.properties

@@ -130,6 +130,7 @@ trusted-cross-origin-domains=*
 # ---------------------------------------------------------------------------
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720
+max-number-of-sessions-per-user = 0
 
 # ---------------------------------------------------------------------------
 # Business rules configuration

openbis/source/java/service.properties

@@ -2,6 +2,7 @@ authentication-service = dummy-authentication-service
 
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720 
+max-number-of-sessions-per-user = 0
 
 session-workspace-root-dir = targets/session-workspace
 

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java

@@ -101,7 +101,7 @@ public class SimplePropertyValidatorTest
                     "M/d/yy HH:mm\n" +
                     "yyyy-MM-dd HH:mm:ss Z\n" +
                     "yyyy-MM-dd'T'HH:mm:ssX\n" +
-                    "yyyy-MM-dd HH:mm:ss ZZZ\n" +
+                    "yyyy-MM-dd HH:mm:ss Z\n" +
                     "yyyy-MM-dd'T'HH:mm:ssXXX]'.");
         }
     }

openbis_standard_technologies/dist/server/service.properties

@@ -173,7 +173,7 @@ session-timeout = 720
 # Session time (in minutes) in case of presents of file etc/nologin.html. Should be < 30. 
 #session-timeout-no-login = 10
 
-# Maximum number of sessions allowed per user. Default value is 1.
+# Maximum number of sessions allowed per user. Zero means unlimited number of sessions. Default value is 1.
 # max-number-of-sessions-per-user = 1
 
 # Comma separated list of users allowed to have unlimited number of sessions. Default: Empty list.

screening/source/java/service.properties

@@ -2,6 +2,7 @@ authentication-service = dummy-authentication-service
 
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720 
+max-number-of-sessions-per-user = 0
 
 session-workspace-root-dir = targets/session-workspace
 

ui-test/resource/service.properties

@@ -2,6 +2,7 @@ authentication-service = dummy-authentication-service
 
 # The time after which an inactive session is expired by the service (in minutes).
 session-timeout = 720 
+max-number-of-sessions-per-user = 0
 
 # Authorization
 # Supported: 'no-authorization' and 'active-authorization'