Skip to content
Snippets Groups Projects
Commit f2823bb6 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

by default test database is map_viewer (standard production db name), it can...

by default test database is map_viewer (standard production db name), it can be configured in /etc/minerva/test-db.properties though
parent 6d668e29
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!386Resolve "Continous integration tests"
Showing
with 24 additions and 14 deletions
......@@ -9,7 +9,9 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.0.xsd">
<context:property-placeholder location="classpath:test-db.properties" />
<context:property-placeholder
ignore-resource-not-found="true"
location="classpath:test-db.properties,file:/etc/minerva/test-db.properties" />
<!-- Data Source Declaration -->
......
database.uri=jdbc:postgresql://localhost:5432/map_viewer-test
database.uri=jdbc:postgresql://localhost:5432/map_viewer
database.username=map_viewer
database.password=123qweasdzxc
\ No newline at end of file
......@@ -11,7 +11,7 @@
<context:property-placeholder
ignore-resource-not-found="true"
location="classpath:test-db.properties,file:/etc/minerva/db.properties" />
location="classpath:test-db.properties,file:/etc/minerva/test-db.properties" />
<!-- Data Source Declaration -->
......@@ -19,7 +19,7 @@
class="com.mchange.v2.c3p0.ComboPooledDataSource"
destroy-method="close">
<property name="driverClass" value="org.postgresql.Driver" />
<property name="jdbcUrl" value="jdbc:postgresql://localhost:5432/map_viewer-test" />
<property name="jdbcUrl" value="${database.uri}" />
<property name="user" value="${database.username}" />
<property name="password" value="${database.password}" />
<property name="maxPoolSize" value="90" />
......
database.uri=jdbc:postgresql://localhost:5432/map_viewer-test
database.uri=jdbc:postgresql://localhost:5432/map_viewer
database.username=map_viewer
database.password=123qweasdzxc
\ No newline at end of file
......@@ -11,7 +11,7 @@
<context:property-placeholder
ignore-resource-not-found="true"
location="classpath:test-db.properties,file:/etc/minerva/db.properties" />
location="classpath:test-db.properties,file:/etc/minerva/test-db.properties" />
<!-- Data Source Declaration -->
......
......@@ -9,7 +9,9 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.0.xsd">
<context:property-placeholder location="classpath:test-db.properties" />
<context:property-placeholder
ignore-resource-not-found="true"
location="classpath:test-db.properties,file:/etc/minerva/test-db.properties" />
<!-- Data Source Declaration -->
......
database.uri=jdbc:postgresql://localhost:5432/map_viewer-test
database.uri=jdbc:postgresql://localhost:5432/map_viewer
database.username=map_viewer
database.password=123qweasdzxc
\ No newline at end of file
......@@ -9,7 +9,9 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.0.xsd">
<context:property-placeholder location="classpath:test-db.properties" />
<context:property-placeholder
ignore-resource-not-found="true"
location="classpath:test-db.properties,file:/etc/minerva/test-db.properties" />
<!-- Data Source Declaration -->
......
database.uri=jdbc:postgresql://localhost:5432/map_viewer-test
database.uri=jdbc:postgresql://localhost:5432/map_viewer
database.username=map_viewer
database.password=123qweasdzxc
\ No newline at end of file
......@@ -9,7 +9,9 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.0.xsd">
<context:property-placeholder location="classpath:test-db.properties" />
<context:property-placeholder
ignore-resource-not-found="true"
location="classpath:test-db.properties,file:/etc/minerva/test-db.properties" />
<!-- Data Source Declaration -->
......
database.uri=jdbc:postgresql://localhost:5432/map_viewer-test
database.uri=jdbc:postgresql://localhost:5432/map_viewer
database.username=map_viewer
database.password=123qweasdzxc
\ No newline at end of file
......@@ -9,7 +9,9 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.0.xsd">
<context:property-placeholder location="classpath:test-db.properties" />
<context:property-placeholder
ignore-resource-not-found="true"
location="classpath:test-db.properties,file:/etc/minerva/test-db.properties" />
<!-- Data Source Declaration -->
......
database.uri=jdbc:postgresql://localhost:5432/map_viewer-test
database.uri=jdbc:postgresql://localhost:5432/map_viewer
database.username=map_viewer
database.password=123qweasdzxc
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment