LMS-1622 get rid of unused data-source properties

SVN: 17019

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

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>

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