CSPACE-6531: Added a requirement for a DB_PORT environment variable.

diff --git a/build.properties b/build.properties
index 59c19ef8b67c60410e009cdcbdf9d1a3fdcdd721..518ff6088e6ddeaa2233128a4ad707551bbe1367 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -10,8 +10,6 @@ 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}
@@ -107,7 +105,6 @@ db=postgresql
 # db.xaDataSource=com.mysql.jdbc.jdbc2.optional.MysqlXADataSource
 
 #For postgresql, uncomment this, and comment out mysql section
-db.port=5432
 db.driver.jar=${db.base.dir}/jdbc_drivers/postgresql-9.1-901.jdbc4.jar
 db.jdbc.driver.class=org.postgresql.Driver
 db.dialect=org.hibernate.dialect.PostgreSQLDialect
@@ -140,6 +137,9 @@ db.cspace.user.password=${env.DB_CSPACE_PASSWORD}
 db.reader.user=reader${cspace.instance.id}
 db.reader.user.password=${env.DB_READER_PASSWORD}
 
+#db.port=5432
+db.port=${env.DB_PORT}
+
 #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 bb1179c3472669dd9fcec0f1f518915771922e0f..8fe2f8e62f3f3b16e5ec217e77184ab48f6c279f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -342,11 +342,13 @@
                                                <configuration>
                                                        <tasks>
                                                                <fail unless="env.CSPACE_INSTANCE_ID"
-                                                                       message="Required environment variable CSPACE_INSTANCE_ID has not been set." />
+                                                                       message="Required environment variable CSPACE_INSTANCE_ID has not been set. Use '_default' as a default value." />
                                                                <fail unless="env.DB_HOST"
-                                                                       message="Required environment variable DB_HOST has not been set." />
+                                                                       message="Required environment variable DB_HOST has not been set.  Use 'localhost' as a default value." />
+                                                               <fail unless="env.DB_PORT"
+                                                                       message="Required environment variable DB_PORT has not been set.  Use 5432 as a default value." />
                                                                <fail unless="env.CSPACE_JEESERVER_HOME"
-                                                                       message="Required environment variable CSPACE_JEESERVER_HOME has not been set." />
+                                                                       message="Required environment variable CSPACE_JEESERVER_HOME has not been set.  Usually the same value as CATALINA_HOME environment variable." />
                                                                <fail unless="env.DB_CSPACE_PASSWORD"
                                                                        message="Required environment variable DB_CSPACE_PASSWORD has not been set." />
                                                                <fail unless="env.DB_NUXEO_PASSWORD"