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

openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/ApplicationServerApiLogger.java

@@ -255,12 +255,18 @@ public class ApplicationServerApiLogger extends AbstractServerLogger implements
         super(sessionManager, context);
     }
 
+    /**
+     * This version is a dummy and should not be used. See {@link ApplicationServerApi}.
+     */
     @Override
     public int getMajorVersion()
     {
         return 3;
     }
 
+    /**
+     * This version is a dummy and should not be used. See {@link ApplicationServerApi}.
+     */
     @Override
     public int getMinorVersion()
     {

openbis_standard_technologies/dist/etc/service.properties

@@ -208,6 +208,8 @@ default-dropbox.storage-processor = ch.systemsx.cisd.etlserver.DefaultStoragePro
 # imaging-database.kind = prod
 # imaging-database.owner = 
 # imaging-database.password = 
+# imaging-database.adminUser = 
+# imaging-database.adminPassword = 
 
 # ---------------------------------------------------------------------------
 # Proteomics database (optional, only used if proteomics technology switched on)

screening/source/core-plugins/screening/4/dss/data-sources/imaging-db/plugin.properties

@@ -12,6 +12,10 @@
 #     Owner of the imaging database. Default value is an empty string (i.e. the user starting up DSS).
 #   imaging-database.password
 #     Password of the owner of the imaging database. Default value is an empty string.
+#   imaging-database.adminUser
+#     Admin user of the database. Default value is an empty string (i.e. the default admin user 'postgres').
+#   imaging-database.adminPassword
+#     Password of the admin user. Default value is an empty string.
 #
 version-holder-class = ch.systemsx.cisd.openbis.dss.etl.ImagingDatabaseVersionHolder
 databaseEngineCode = postgresql
@@ -21,4 +25,5 @@ databaseKind = ${imaging-database.kind:prod}
 scriptFolder = ${screening-sql-root-folder:}sql/imaging
 owner = ${imaging-database.owner:}
 password = ${imaging-database.password:}
-
+adminUser = ${imaging-database.adminUser:}
+adminPassword = ${imaging-database.adminPassword:}