From 2f1e41c819987c986c2fcd9976fab232644ba0a2 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 14 Jul 2010 09:14:42 +0000
Subject: [PATCH] LMS-1622 get rid of unused data-source properties
SVN: 17019
---
screening/dist/server/service.properties | 13 +---------
.../java/screening-applicationContext.xml | 24 -------------------
screening/source/java/service.properties | 10 --------
3 files changed, 1 insertion(+), 46 deletions(-)
diff --git a/screening/dist/server/service.properties b/screening/dist/server/service.properties
index ca721438380..95e0c26f646 100644
--- a/screening/dist/server/service.properties
+++ b/screening/dist/server/service.properties
@@ -26,18 +26,7 @@ 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_${imaging.database.kind}
-
-imaging.database.engine = postgresql
-imaging.database.create-from-scratch = false
-imaging.database.script-single-step-mode = false
-imaging.database.url-host-part =
-imaging.database.kind = productive
-imaging.database.owner =
-imaging.database.owner-password =
-imaging.database.admin-user =
-imaging.database.admin-password =
-imaging.script-folder = screening
+dss-based-data-source-provider.dss-screening.database-url = jdbc:postgresql://localhost/imaging_productive
#crowd.service.host = crowd-bsse.ethz.ch
#crowd.service.port = 8443
diff --git a/screening/source/java/screening-applicationContext.xml b/screening/source/java/screening-applicationContext.xml
index 9045e564a97..fb7b1f1a948 100644
--- a/screening/source/java/screening-applicationContext.xml
+++ b/screening/source/java/screening-applicationContext.xml
@@ -9,30 +9,6 @@
<import resource="applicationContext.xml"/>
- <bean id="imaging-db-configuration-context"
- class="ch.systemsx.cisd.dbmigration.DatabaseConfigurationContext">
- <property name="basicDatabaseName" value="imaging" />
- <property name="createFromScratch" value="${imaging.database.create-from-scratch}" />
- <property name="scriptSingleStepMode" value="${imaging.database.script-single-step-mode}" />
- <property name="sequenceNameMapper">
- <bean class="ch.systemsx.cisd.openbis.generic.server.dataaccess.db.SequenceNameMapper" />
- </property>
- <property name="urlHostPart" value="${imaging.database.url-host-part}" />
- <property name="adminUser" value="${imaging.database.admin-user}" />
- <property name="owner" value="${imaging.database.owner}" />
- <property name="readOnlyGroup" value="imaging_readonly" />
- <property name="password" value="${imaging.database.owner-password}" />
- <property name="adminPassword" value="${imaging.database.admin-password}" />
- <property name="databaseKind" value="${imaging.database.kind}" />
- <property name="databaseEngineCode" value="${imaging.database.engine}" />
- <property name="scriptFolder" value="${imaging.script-folder}/sql" />
- <property name="databaseInstance" value="${imaging.database-instance}" />
- </bean>
-
- <bean id="single-data-source-provider" class="ch.systemsx.cisd.openbis.generic.server.dataaccess.SingleDataSourceProvider">
- <constructor-arg ref="imaging-db-configuration-context"/>
- </bean>
-
<bean id="dss-based-data-source-provider" class="ch.systemsx.cisd.openbis.generic.server.dataaccess.DataStoreServerBasedDataSourceProvider">
<constructor-arg ref="dao-factory"/>
</bean>
diff --git a/screening/source/java/service.properties b/screening/source/java/service.properties
index 4e7182c78e6..707e2e149d3 100644
--- a/screening/source/java/service.properties
+++ b/screening/source/java/service.properties
@@ -28,16 +28,6 @@ dss-based-data-source-provider.dss-screening.database-driver = org.postgresql.Dr
dss-based-data-source-provider.dss-screening.database-url = jdbc:postgresql://localhost/imaging_dev
dss-based-data-source-provider.my-dss. = dss-based-data-source-provider.dss-screening.
-imaging.database.engine = postgresql
-imaging.database.create-from-scratch = false
-imaging.database.script-single-step-mode = false
-imaging.database.url-host-part =
-imaging.database.kind = dev
-imaging.database.owner =
-imaging.database.owner-password =
-imaging.database.admin-user =
-imaging.database.admin-password =
-
crowd.service.host = crowd-bsse.ethz.ch
crowd.service.port = 8443
crowd.application.name = lims
--
GitLab