From 71e9a726a64e5298c9327b82e6d2c757c4b55845 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 11 May 2011 07:39:06 +0000
Subject: [PATCH] add template service.properties for openBIS in test-screening
SVN: 21224
---
.../integration-tests-service.properties | 8 ---
.../service.properties | 68 +++++++++++++++++++
integration-tests/test-screening.sh | 2 +-
3 files changed, 69 insertions(+), 9 deletions(-)
delete mode 100644 integration-tests/templates/openBIS-server-screening/integration-tests-service.properties
create mode 100644 integration-tests/templates/openBIS-server-screening/service.properties
diff --git a/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties b/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties
deleted file mode 100644
index 29968581aed..00000000000
--- a/integration-tests/templates/openBIS-server-screening/integration-tests-service.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# ---------------------------------------------------------------------------
-# These lines override the distribution configuration to make it possible
-# to run integration tests.
-# ---------------------------------------------------------------------------
-
-dss-based-data-source-provider.dss-screening.database-url = jdbc:postgresql://localhost/imaging_integration_tests
-database.kind = screening_integration_tests
\ No newline at end of file
diff --git a/integration-tests/templates/openBIS-server-screening/service.properties b/integration-tests/templates/openBIS-server-screening/service.properties
new file mode 100644
index 00000000000..48fec81862e
--- /dev/null
+++ b/integration-tests/templates/openBIS-server-screening/service.properties
@@ -0,0 +1,68 @@
+# Supported: 'file-authentication-service', 'crowd-authentication-service', 'dummy-authentication-service'
+authentication-service = dummy-authentication-service
+
+# The time after which an inactive session is expired by the service (in minutes).
+session-timeout = 720
+
+# Authorization
+# Supported: 'no-authorization' and 'active-authorization'
+authorization-component-factory = active-authorization
+
+script-folder = .
+
+# Supported: currently only 'postgresql' is supported
+database.engine = postgresql
+database.create-from-scratch = false
+# For debugging set this value to true.
+database.script-single-step-mode = false
+database.url-host-part =
+database.kind = screening_integration_tests
+database.owner =
+database.owner-password =
+database.admin-user =
+database.admin-password =
+
+data-source-provider = dss-based-data-source-provider
+
+dss-based-data-source-provider.data-store-servers = dss-screening
+dss-based-data-source-provider.dss-screening.database-driver = org.postgresql.Driver
+dss-based-data-source-provider.dss-screening.database-url = jdbc:postgresql://localhost/imaging_integration_tests
+
+#crowd.service.host = crowd-bsse.ethz.ch
+#crowd.service.port = 8443
+#crowd.application.name = <openbis_application_name_in_crowd>
+#crowd.application.password = <password>
+
+# The database instance local unique identifier. Used when the new database is created.
+database-instance = HCS
+
+# The URL of the CIFEX server
+cifex-url = https://cifex.ethz.ch:443
+
+# Cifex users that will receive and automatically manage uploaded data.
+# The user names should be prepended with 'id:' prefix for example:
+# cifex-recipient = id:dropboxuser, id:backpuser
+cifex-recipient = id:cifexdatamanager
+
+# Hibernate Search
+# The working directory.
+hibernate.search.index-base = ./indices-${database.kind}
+# One of NO_INDEX, SKIP_IF_MARKER_FOUND, INDEX_FROM_SCRATCH.
+# If not specified, default (SKIP_IF_MARKER_FOUND) is taken.
+hibernate.search.index-mode = SKIP_IF_MARKER_FOUND
+#hibernate.search.index-mode = INDEX_FROM_SCRATCH
+# Defines the maximum number of elements indexed before flushing the transaction-bound queue.
+# Default is 1000.
+hibernate.search.batch-size = 1000
+# Maximum number of search results
+hibernate.search.maxResults = 100000
+# If 'async', the update of indices will be done in a separate thread.
+hibernate.search.worker.execution=async
+
+web-client-configuration-file = etc/web-client.properties
+
+# ---------------------------------------------------------------------------
+# anonymous login configuration
+# ---------------------------------------------------------------------------
+# Login of the existing user whose settings will be used for anonymous login
+#user-for-anonymous-login = <user-login>
\ No newline at end of file
diff --git a/integration-tests/test-screening.sh b/integration-tests/test-screening.sh
index 25fafce9b69..a75858ec56f 100755
--- a/integration-tests/test-screening.sh
+++ b/integration-tests/test-screening.sh
@@ -59,7 +59,7 @@ function install_and_run_openbis_server_screening {
mv $openbis_server_dir/openBIS-server/* $openbis_server_dir
rmdir $openbis_server_dir/openBIS-server
- cat $TEMPLATE/$openbis_server_name/integration-tests-service.properties >> $openbis_server_dir/service.properties
+ cp -v $TEMPLATE/$openbis_server_name/service.properties $openbis_server_dir/service.properties
$openbis_server_dir/install.sh $PWD/$openbis_server_dir
startup_openbis_server $openbis_server_dir
wait_for_server
--
GitLab