CSPACE-6531: Merging changes made for collectionspace-deployments/mmi-v4.1 that inclu...

diff --git a/build.properties b/build.properties
index 768c1dbcfa66ac1c01d1a41340bec4486c88d777..59c19ef8b67c60410e009cdcbdf9d1a3fdcdd721 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -5,9 +5,13 @@ host=127.0.0.1
 # multiple CollectionSpace servers all share a single database server.
 # The instance ID is blank by default. If it is added, by convention, 
 # instance IDs should begin with an underscore (_). E.g.: _trs80
-cspace.instance.id=
+
 release.version=4.2
 cspace.release=${release.version}-SNAPSHOT
+cspace.instance.id=${env.CSPACE_INSTANCE_ID}
+
+
+
 cspace.services.release=cspace-services-${cspace.release}
 domain.cspace=cspace-services
 cspace.services.context=${domain.cspace}
@@ -136,7 +140,8 @@ db.cspace.user.password=${env.DB_CSPACE_PASSWORD}
 db.reader.user=reader${cspace.instance.id}
 db.reader.user.password=${env.DB_READER_PASSWORD}
 
-db.host=localhost
+#db.host=localhost
+db.host=${env.DB_HOST}
 db.jdbc.baseurl=jdbc:${db}://${db.host}:${db.port}
 
 #

diff --git a/pom.xml b/pom.xml
index 2c94a0cd02b1002356bba069af077f221440a653..d0029401027dec6b12391cf0320b6170e896519f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a NOT a test -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 

diff --git a/services/account/client/pom.xml b/services/account/client/pom.xml
index 9b26d519b5d5bf31a04dc8cbdd1cb5b54030759c..25e50b85be7a77511269306830140a4da517cc3a 100644 (file)
--- a/services/account/client/pom.xml
+++ b/services/account/client/pom.xml
@@ -116,6 +116,16 @@
                 </executions>
             </plugin>
         </plugins>
+               <filters>
+                       <filter>../../../build.properties</filter>
+               </filters>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                               <filtering>true</filtering>
+                       </resource>
+               </resources>
+               
     </build>
 
 </project>