CSPACE-6504: Replaced non-instance qualified database names in property values.

diff --git a/build.properties b/build.properties
index 4b4c5dbbf843e3173f1e641b7931242d2a6e2b7d..e4235883458bdb8ebafcf2d97f42070984075c8b 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -167,11 +167,11 @@ db.jdbc.urloptions.encoded=foo=true&bar=false
 #\r
 # JDBC urls that CollectionSpace needs to talk to the "admin" database, Nuxeo databases, and the "cspace" database (i.e., the AuthN/AuthZ database)\r
 #\r
-db.jdbc.csadmin.url=${db.jdbc.baseurl}/postgres?${db.jdbc.urloptions}\r
-db.jdbc.csadmin.url.encoded=${db.jdbc.baseurl}/postgres?${db.jdbc.urloptions.encoded}\r
+db.jdbc.csadmin.url=${db.jdbc.baseurl}/${db.csadmin.name}?${db.jdbc.urloptions}\r
+db.jdbc.csadmin.url.encoded=${db.jdbc.baseurl}/${db.csadmin.name}?${db.jdbc.urloptions.encoded}\r
 \r
 db.jdbc.nuxeo.url=${db.jdbc.baseurl}/${DatabaseName}?${db.jdbc.urloptions}\r
 db.jdbc.nuxeo.url.encoded=${db.jdbc.baseurl}/${DatabaseName}?${db.jdbc.urloptions.encoded}\r
 \r
-db.jdbc.cspace.url=${db.jdbc.baseurl}/cspace?${db.jdbc.urloptions}\r
-db.jdbc.cspace.url.encoded=${db.jdbc.baseurl}/cspace?${db.jdbc.urloptions.encoded}
\ No newline at end of file
+db.jdbc.cspace.url=${db.jdbc.baseurl}/${db.cspace.name}?${db.jdbc.urloptions}\r
+db.jdbc.cspace.url.encoded=${db.jdbc.baseurl}/${db.cspace.name}?${db.jdbc.urloptions.encoded}
\ No newline at end of file