From: remillet <remillet@yahoo.com>
Date: Tue, 19 Jan 2016 00:03:47 +0000 (-0800)
Subject: CSPACE-6844: JEE_PORT is now a required environment variable.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=6279213781026892401336005ddc63ce22f7660f;p=tmp%2Fjakarta-migration.git

CSPACE-6844: JEE_PORT is now a required environment variable.
---

diff --git a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/lib/commons-collections-3.2.1.jar b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/lib/commons-collections-3.2.1.jar
deleted file mode 100644
index c35fa1fee..000000000
Binary files a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/lib/commons-collections-3.2.1.jar and /dev/null differ
diff --git a/3rdparty/nuxeo/nuxeo-server/6.0-HF21/lib/commons-collections-3.2.2.jar b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/lib/commons-collections-3.2.2.jar
new file mode 100644
index 000000000..fa5df82a6
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/6.0-HF21/lib/commons-collections-3.2.2.jar differ
diff --git a/build.properties b/build.properties
index 61bd5bedc..9ddd404d0 100644
--- a/build.properties
+++ b/build.properties
@@ -56,7 +56,7 @@ jee.bin=${jee.home}/bin
 
 #JEE Application Server cspace domain
 jee.domain.cspace=${domain.cspace}
-jee.domain.cspace.port=8180
+jee.domain.cspace.port=${env.JEE_PORT}
 jee.server.cspace=${jee.home}
 jee.deploy.cspace=${jee.server.cspace}/webapps
 jee.lib.cspace=${jee.server.cspace}/lib
diff --git a/pom.xml b/pom.xml
index f11b79215..721456639 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,6 +336,7 @@
 				before we perform any build related tasks. -->
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
+				<version>1.7</version>
 				<executions>
 					<execution>
 						<id>check-environment-vars</id>
@@ -345,8 +346,11 @@
 						</goals>
 						<configuration>
 							<tasks>
+								<property environment="env" />
 								<fail unless="env.CSPACE_INSTANCE_ID"
 									message="Required environment variable CSPACE_INSTANCE_ID has not been set. Use '_default' as a default value." />
+								<fail unless="env.JEE_PORT"
+									message="Required environment variable JEE_PORT has not been set.  Use '8180' as a default value." />
 								<fail unless="env.DB_HOST"
 									message="Required environment variable DB_HOST has not been set.  Use 'localhost' as a default value." />
 								<fail unless="env.DB_PORT"
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 42973269b..47c6e5d3b 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -17,6 +17,11 @@
     </properties>
 
     <dependencies>
+    	<dependency>
+    		<groupId>commons-collections</groupId>
+  			<artifactId>commons-collections</artifactId>
+  			<version>3.2.2</version>
+    	</dependency>
   		<dependency>
   			<artifactId>lucene-analyzers-common</artifactId>
   			<groupId>org.apache.lucene</groupId>