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 (file)
index c35fa1f..0000000
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 (file)
index 0000000..fa5df82
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 61bd5bedc39ae87022df3d5ba8401d165f274b89..9ddd404d029c08e7cf9a6ada27de4bbd25b7d9df 100644 (file)
--- 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 f11b7921525eea87201955ccf57870ced29bbe38..7214566393870e57ad9c6bcd0528f3ea2746392c 100644 (file)
--- 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 42973269bf05a631de0e09431885e8bed5d407fe..47c6e5d3be150a54e8179775cb70e4506561756a 100644 (file)
--- 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>