From: remillet <remillet@yahoo.com>
Date: Mon, 20 Apr 2015 20:15:17 +0000 (-0700)
Subject: CSPACE-6531: Merging changes made for collectionspace-deployments/mmi-v4.1 that inclu... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=782081e16dd0ec584ece331ff639c587c9dcabe6;p=tmp%2Fjakarta-migration.git

CSPACE-6531: Merging changes made for collectionspace-deployments/mmi-v4.1 that include env vars for instance_id and db_host id.
---

diff --git a/build.properties b/build.properties
index 768c1dbcf..59c19ef8b 100644
--- 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 2c94a0cd0..d00294010 100644
--- 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 9b26d519b..25e50b85b 100644
--- 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>