CSPACE-643 build now requires the following properties set in the environment.

DB_USER, DB_PASSWORD (for create_db, gen_ddl tasks) and JBOSS_HOME (for deploy)
Each build.xml reads environment before loading build.properties. build.properties uses environment variables to set db.user, db.user.password and jboss.dir properties.
Database and user specific properties are also externalized from hibernate.cfg.xml used by gen_ddl task. Before invoking gen_ddl subsitution occurs as a pre-requisite.
tests: mvn test at services level, ant create_db at trunk level, gen_ddl at account and authentication client levels

M    trunk/services/authentication/service/build.xml
M    trunk/services/authentication/client/src/test/resources/hibernate.cfg.xml
M    trunk/services/authentication/client/build.xml
M    trunk/services/authentication/build.xml
M    trunk/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
M    trunk/services/collectionobject/3rdparty/build.xml
M    trunk/services/collectionobject/build.xml
M    trunk/services/JaxRsServiceProvider/build.xml
M    trunk/services/common/build.xml
M    trunk/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
M    trunk/services/acquisition/3rdparty/build.xml
M    trunk/services/acquisition/build.xml
M    trunk/services/account/build.xml
M    trunk/services/account/client/src/test/resources/hibernate.cfg.xml
M    trunk/services/account/client/build.xml
M    trunk/services/id/service/build.xml
M    trunk/services/id/build.xml
M    trunk/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
M    trunk/services/vocabulary/3rdparty/build.xml
M    trunk/services/vocabulary/build.xml
M    trunk/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
M    trunk/services/intake/3rdparty/build.xml
M    trunk/services/intake/build.xml
M    trunk/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
M    trunk/services/relation/3rdparty/build.xml
M    trunk/services/relation/build.xml
M    trunk/build.properties
M    trunk/build.xml
M    trunk/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.properties
M    trunk/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
M    trunk/3rdparty/nuxeo/build.xml
M    trunk/3rdparty/build.xml

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index 18747454a53df87a5f117891d750568d2f07ff4a..397b8e170f9a0220ca1c39615422efa3ce9ddc50 100644 (file)
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value=".."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 3998dcfd5827bbb63b8553e3e8624bb653f12571..7bf63d8bc5216ee787a198bea93bf666692de0ea 100644 (file)
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.properties b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.properties
index c26799aa9250d84ea871a3c75099388b5a3e4a58..ab6f6614abf5ae906e05875f42cd91afab414043 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.properties
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.properties
@@ -1,5 +1,5 @@
 # Example for Windows
-jboss.dir=c:/dev/jboss-4.2.3.GA
+jboss.dir=${env.JBOSS_HOME}
 # Example for Unix
 #jboss.dir=/opt/jboss
 

diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
index d4e3b266c1a9c04993b85840d4b7234c04f886c1..e26e09c584ec9478a4fb5bfb851f09c8575a4c6e 100644 (file)
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <project name="nuxeo cs" default="all" basedir=".">
 
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
   <property file="build.properties" />
   <property name="cs.nuxeo.jar" value="nuxeo-platform-collectionspace-5.2-SNAPSHOT.jar"/>
 

diff --git a/build.properties b/build.properties
index 956127b9ea11b6a6b96110003026a4f6d13375fc..d8f869199de5d0e20309f827752393a25e32472c 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -36,7 +36,7 @@ dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
 #jboss\r
 #assumption: both nuxeo and cspace domains are using the same JBoss installation\r
 jboss.release=jboss-4.2.3.GA\r
-jboss.dir=/home/sanjaydalal/work/${jboss.release}\r
+jboss.dir=${env.JBOSS_HOME}\r
 jboss.home=${jboss.dir}\r
 \r
 #jboss cspace domain\r
@@ -58,8 +58,11 @@ jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}
 #database\r
 db=mysql\r
 db.script.dir=${basedir}/src/main/resources/db/${db}\r
-db.user=root\r
-db.user.password=admin\r
+db.user=${env.DB_USER}\r
+db.user.password=${env.DB_PASSWORD}\r
 db.host=localhost\r
 db.port=3306\r
-db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar
\ No newline at end of file
+db.driver.jar=${jboss.lib.cspace}/mysql-connector-java-5.1.7-bin.jar\r
+db.jdbc.url=jdbc:${db}://${db.host}:${db.port}/cspace\r
+db.jdbc.driver.class=com.mysql.jdbc.Driver\r
+db.dialect=org.hibernate.dialect.MySQLDialect\r

diff --git a/build.xml b/build.xml
index 7af82a079190535e6ad7642630b55617eabde5c1..4f4e1888eb319cea2c93b939ddd20bae88d3cbcc 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,9 @@
     <description>\r
         collectionspace services\r
     </description>\r
-  <!-- set global properties for this build -->\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
+    <!-- set global properties for this build -->\r
     <property file="build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
@@ -266,7 +268,7 @@
         <copy todir="${basedir}/${dist.installer}">\r
             <fileset file="${basedir}/build.properties"/>\r
             <fileset dir="installer"/>\r
-            <fileset dir="${src}/main/resources/scripts"/>            \r
+            <fileset dir="${src}/main/resources/scripts"/>\r
         </copy>\r
         <ant antfile="services/build.xml" target="dist_installer" inheritAll="false"/>\r
     </target>\r

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index e6ba44aa676be315326d197fd180dbb6344ce30e..a96d191c550cc007dbdd9c01b8a684ea84922e0e 100644 (file)
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -5,6 +5,8 @@
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>

diff --git a/services/account/build.xml b/services/account/build.xml
index 6c5a6f903f4ff31aefc8092baef98b2169dc04a7..cf82f7bd7eae5902bcd3b82faca3fdb4369b03c9 100644 (file)
--- a/services/account/build.xml
+++ b/services/account/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/account/client/build.xml b/services/account/client/build.xml
index 380c36fa9c8c76cabae7206e53d4b294767c17c7..538e37c770dbde7c9bf06313b8c1a91ed83be3e8 100644 (file)
--- a/services/account/client/build.xml
+++ b/services/account/client/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
@@ -107,9 +109,26 @@
         </exec>\r
     </target>\r
 \r
+\r
+    <target name="setup_hibernate.cfg" description="replace property keywords in hibernate.cfg.xml">\r
+        <property name="src.hibernate.cfg" value="${basedir}/src/test/resources/hibernate.cfg.xml"/>\r
+        <property name="dest.hibernate.cfg" value="${basedir}/target/test-classes/hibernate.cfg.xml"/>\r
+        <delete file="${dest.hibernate.cfg}" verbose="true" />\r
+        <filter token="DB_URL" value="${db.jdbc.url}" />\r
+        <filter token="DB_DRIVER_CLASS" value="${db.jdbc.driver.class}" />\r
+        <filter token="DB_USER" value="${env.DB_USER}" /> <!-- double-sub from ${db.user} fails -->\r
+        <filter token="DB_PASSWORD" value="${env.DB_PASSWORD}" /> <!-- double-sub from ${db.user.password} fails -->\r
+        <filter token="DB_DIALECT" value="${db.dialect}" />\r
+        <copy todir="${basedir}/target/test-classes" filtering="true">\r
+            <fileset dir="${basedir}/src/test/resources">\r
+                <include name="hibernate.cfg.xml" />\r
+            </fileset>\r
+        </copy>\r
+    </target>\r
+\r
     <target name="gen_ddl" depends="gen_ddl-unix,gen_ddl-windows"\r
   description="geneate ddl" />\r
-    <target name="gen_ddl-unix" if="osfamily-unix">\r
+    <target name="gen_ddl-unix" if="osfamily-unix" depends="setup_hibernate.cfg">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="-Pddl" />\r
             <arg value="process-test-resources" />\r
@@ -119,7 +138,7 @@
             <arg value="${mvn.opts}" />\r
         </exec>\r
     </target>\r
-    <target name="gen_ddl-windows" if="osfamily-windows">\r
+    <target name="gen_ddl-windows" if="osfamily-windows" depends="setup_hibernate.cfg">\r
         <exec executable="cmd" failonerror="true">\r
             <arg value="/c" />\r
             <arg value="mvn.bat" />\r

diff --git a/services/account/client/src/test/resources/hibernate.cfg.xml b/services/account/client/src/test/resources/hibernate.cfg.xml
index c7c6009951511f4dc51567bf7f52c11d0e428c69..8296399cf33de770654f4940a04619ad72791eaf 100644 (file)
--- a/services/account/client/src/test/resources/hibernate.cfg.xml
+++ b/services/account/client/src/test/resources/hibernate.cfg.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Document   : hibernate.cfg.xml.xml
-    Created on : November 12, 2009, 12:02 PM
-    Author     : sanjaydalal
+    Document   : hibernate.cfg.xml
+    Created on : 
+    Author     : 
     Description:
-        Purpose of the document follows.
+        Hibernate configuration file for testing and tools
 -->
 <!DOCTYPE hibernate-configuration PUBLIC
           "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
           "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
-        <property name="connection.url">jdbc:mysql://localhost:3306/cspace</property>
-        <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-        <property name="connection.username">test</property>
-        <property name="connection.password">test</property>
-        <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+        <property name="connection.url">@DB_URL@</property>
+        <property name="connection.driver_class">@DB_DRIVER_CLASS@</property>
+        <property name="connection.username">@DB_USER@</property>
+        <property name="connection.password">@DB_PASSWORD@</property>
+        <property name="dialect">@DB_DIALECT@</property>
         <property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
         <property name="current_session_context_class">thread</property>
         <property name="hibernate.show_sql">true</property>

diff --git a/services/acquisition/3rdparty/build.xml b/services/acquisition/3rdparty/build.xml
index 1acd417343065db2c766e30482d6309eba6da8c9..8cf5bce762819c1877c9e4da27a632d4eb844aaa 100644 (file)
--- a/services/acquisition/3rdparty/build.xml
+++ b/services/acquisition/3rdparty/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
index 95f83cf1e1cffaa75cf113b0015917a1cf918dd1..2d9b4852af185e80635f8a1e550f7e41ec3d3d82 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/build.xml
@@ -5,6 +5,8 @@
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>

diff --git a/services/acquisition/build.xml b/services/acquisition/build.xml
index fa283736faa39e11e331d4dd59259377e20ab8cc..e5187d3855297e1dacba54bbbd304a6a864ee2f2 100644 (file)
--- a/services/acquisition/build.xml
+++ b/services/acquisition/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index 6d4ccff2ba62828614aca1f00c350a9a39884b1e..e63117331504431c32cc0503cdd5bcf860425f05 100644 (file)
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/authentication/client/build.xml b/services/authentication/client/build.xml
index 6736c399f3039a040c2ee2720218321bd118ab0d..631350b8674500546f2b3a4588d1fe7dcf596c7c 100644 (file)
--- a/services/authentication/client/build.xml
+++ b/services/authentication/client/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
@@ -106,10 +108,27 @@
             <arg value="${mvn.opts}" />\r
         </exec>\r
     </target>\r
+    \r
+    <target name="setup_hibernate.cfg" description="replace property keywords in hibernate.cfg.xml">\r
+        <property name="src.hibernate.cfg" value="${basedir}/src/test/resources/hibernate.cfg.xml"/>\r
+        <property name="dest.hibernate.cfg" value="${basedir}/target/test-classes/hibernate.cfg.xml"/>\r
+        <delete file="${dest.hibernate.cfg}" verbose="true" />\r
+        <filter token="DB_URL" value="${db.jdbc.url}" />\r
+        <filter token="DB_DRIVER_CLASS" value="${db.jdbc.driver.class}" />\r
+        <filter token="DB_USER" value="${env.DB_USER}" /> <!-- double-sub from ${db.user} fails -->\r
+        <filter token="DB_PASSWORD" value="${env.DB_PASSWORD}" /> <!-- double-sub from ${db.user.password} fails -->\r
+        <filter token="DB_DIALECT" value="${db.dialect}" />\r
+        <copy todir="${basedir}/target/test-classes" filtering="true">\r
+            <fileset dir="${basedir}/src/test/resources">\r
+                <include name="hibernate.cfg.xml" />\r
+            </fileset>\r
+        </copy>\r
+    </target>\r
+\r
 \r
     <target name="gen_ddl" depends="gen_ddl-unix,gen_ddl-windows"\r
   description="geneate ddl" />\r
-    <target name="gen_ddl-unix" if="osfamily-unix">\r
+    <target name="gen_ddl-unix" if="osfamily-unix" depends="setup_hibernate.cfg">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="-Pddl" />\r
             <arg value="process-test-resources" />\r
@@ -119,7 +138,7 @@
             <arg value="${mvn.opts}" />\r
         </exec>\r
     </target>\r
-    <target name="gen_ddl-windows" if="osfamily-windows">\r
+    <target name="gen_ddl-windows" if="osfamily-windows" depends="setup_hibernate.cfg">\r
         <exec executable="cmd" failonerror="true">\r
             <arg value="/c" />\r
             <arg value="mvn.bat" />\r

diff --git a/services/authentication/client/src/test/resources/hibernate.cfg.xml b/services/authentication/client/src/test/resources/hibernate.cfg.xml
index 9c2b94e2cbba73fcfc76ab773f9e148caca1fe93..8296399cf33de770654f4940a04619ad72791eaf 100644 (file)
--- a/services/authentication/client/src/test/resources/hibernate.cfg.xml
+++ b/services/authentication/client/src/test/resources/hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Document   : hibernate.cfg.xml.xml
+    Document   : hibernate.cfg.xml
     Created on : 
     Author     : 
     Description:
@@ -12,11 +12,11 @@
           "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 <hibernate-configuration>
     <session-factory>
-        <property name="connection.url">jdbc:mysql://localhost:3306/cspace</property>
-        <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
-        <property name="connection.username">test</property>
-        <property name="connection.password">test</property>
-        <property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+        <property name="connection.url">@DB_URL@</property>
+        <property name="connection.driver_class">@DB_DRIVER_CLASS@</property>
+        <property name="connection.username">@DB_USER@</property>
+        <property name="connection.password">@DB_PASSWORD@</property>
+        <property name="dialect">@DB_DIALECT@</property>
         <property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
         <property name="current_session_context_class">thread</property>
         <property name="hibernate.show_sql">true</property>

diff --git a/services/authentication/service/build.xml b/services/authentication/service/build.xml
index a10f3150a86a80bbdc3b42ab64e061fb025220d7..02ff80cee89219bf4569c4776360b4836060d407 100644 (file)
--- a/services/authentication/service/build.xml
+++ b/services/authentication/service/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
@@ -114,13 +116,15 @@
         <copy todir="${jboss.server.cspace}/cspace/services">\r
             <fileset dir="${src}/main/resources/"/>\r
         </copy>\r
-        <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>\r
+        <echo message="Add authentication-policy cspace from ${jboss.server.cspace}/cspace/services/jboss-login-config.xml to ${jboss.server.cspace}/conf/login-config.xml"/>\r
+        <echo message="See Authentication Service Configuration Guide on wiki.collectionspace.org for more details" />\r
     </target>\r
 \r
     <target name="undeploy"\r
     description="undeploy authentication service from ${jboss.server.cspace}">\r
         <delete file="${jboss.server.cspace}/lib/${authentication.jar}"/>\r
-        <echo message="Remove authentication-policy from ${jboss.server.cspace}/conf/login-config.xml"/>\r
+        <echo message="Remove authentication-policy cspace from ${jboss.server.cspace}/conf/login-config.xml"/>\r
+         <echo message="See Authentication Service Configuration Guide on wiki.collectionspace.org for more details"/>\r
     </target>\r
 \r
     <target name="dist"\r

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
index 2793588820e7a0e1a84c7714040babd4a1a7f7cb..8b9e1998359ec7b38bb42f6ed5421d4c4a71ca8a 100644 (file)
--- a/services/collectionobject/3rdparty/build.xml
+++ b/services/collectionobject/3rdparty/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+     <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index b335dec262065478242385ca163de8f596b049ad..5d379105f2e0ac0ca1e364e015a9992901c37b43 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
index 95d4e3f062d278fcbc2b4e656dd5250679822238..6c6a7f9e5fa3810e86a257236fe4686d40951167 100644 (file)
--- a/services/collectionobject/build.xml
+++ b/services/collectionobject/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
@@ -127,7 +129,7 @@
         <!-- copy install scripts, etc. -->\r
         <copy todir="${services.trunk}/${dist.installer.services}/collectionobject">\r
             <fileset dir="./installer"/>\r
-        </copy>    \r
+        </copy>\r
         <ant antfile="3rdparty/build.xml" target="dist_installer" inheritall="false"/>\r
     </target>\r
 \r

diff --git a/services/common/build.xml b/services/common/build.xml
index c689430ee3f63c0376277ae9994c7911a3785ed5..3a725fdfa55f0e5d2bc532bb612c31897e4b1790 100644 (file)
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -5,6 +5,8 @@
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>

diff --git a/services/id/build.xml b/services/id/build.xml
index 7f6bba48a92341efea4e48c9e7dc24e4878cdb57..e84303625adb66bea7be871018acba40f5f828ee 100644 (file)
--- a/services/id/build.xml
+++ b/services/id/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="service/src"/>\r

diff --git a/services/id/service/build.xml b/services/id/service/build.xml
index c7fe75a8daf4312c951b5064ad7a9671dda70c65..d5a544fd4f3fcbe16c4add9610c44a544248b53d 100644 (file)
--- a/services/id/service/build.xml
+++ b/services/id/service/build.xml
@@ -5,6 +5,8 @@
     </description>
     <!-- set global properties for this build -->
     <property name="services.trunk" value="../../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>

diff --git a/services/intake/3rdparty/build.xml b/services/intake/3rdparty/build.xml
index 2de95591f12ec1eb8a577f1a11c03b71c466e828..3c02035d18e60e3ebe34db83a69e0e3dfd270753 100644 (file)
--- a/services/intake/3rdparty/build.xml
+++ b/services/intake/3rdparty/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
index 1ce3256bc9a9044064b92ce246cf2ca98e699612..5d94507c2e3394bfab1e5ae400d12aa9c95ddd02 100644 (file)
--- a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
+++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
@@ -5,6 +5,8 @@
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>

diff --git a/services/intake/build.xml b/services/intake/build.xml
index 9d8b03f6c92f6563999af9d9b035b517657b76ed..d0235ce6044b21138640b3fba74501eea8197843 100644 (file)
--- a/services/intake/build.xml
+++ b/services/intake/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/relation/3rdparty/build.xml b/services/relation/3rdparty/build.xml
index 31f25efc23e17f16dcbdcbf8b9d0190cefe9573f..384814117d2b420ee822261e17a9f4b8a45625ff 100644 (file)
--- a/services/relation/3rdparty/build.xml
+++ b/services/relation/3rdparty/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
index 3adb7e9454ea48922456695c55d96affef6e3f50..bfbae14814745c3112c4cdc3eab4ea81695bbd5e 100644 (file)
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/relation/build.xml b/services/relation/build.xml
index abd1a7547a046c4ac67281d9e43764cf2b3410ad..97c11228e2f3e2684a7f529cb0e3ad2c7c4976ec 100644 (file)
--- a/services/relation/build.xml
+++ b/services/relation/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/vocabulary/3rdparty/build.xml b/services/vocabulary/3rdparty/build.xml
index 18d4c85899d800f7f7668abfef2c5bc89f878068..43e004eea6e11d0a7d7457e673c11f155d9a6ab0 100644 (file)
--- a/services/vocabulary/3rdparty/build.xml
+++ b/services/vocabulary/3rdparty/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
+    <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r

diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
index 8688b08017997fea6bc1dc5f2e9d998dddd6415c..647370a11f0c5998e3578806ce790250cfa1e5ee 100644 (file)
--- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
+++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/build.xml
@@ -5,6 +5,8 @@
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../../../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>

diff --git a/services/vocabulary/build.xml b/services/vocabulary/build.xml
index f56f37c2e04011aafdff421b528dfc35b2ef4e7f..036120fbf0246b4bfe6784d8f85d706fbcb10ae0 100644 (file)
--- a/services/vocabulary/build.xml
+++ b/services/vocabulary/build.xml
@@ -5,6 +5,8 @@
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
+        <!-- enviornment should be declared before reading build.properties -->\r
+    <property environment="env" />\r
     <property file="${services.trunk}/build.properties" />\r
     <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
@@ -115,9 +117,9 @@
 \r
     <target name="dist" depends="package"\r
         description="distribute vocabulary service">\r
-        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>        \r
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
         <ant antfile="client/build.xml" target="dist" inheritall="false"/>\r
-        <ant antfile="import/build.xml" target="dist" inheritall="false"/>        \r
+        <ant antfile="import/build.xml" target="dist" inheritall="false"/>\r
     </target>\r
 \r
     <target name="dist_installer" depends="package"\r
@@ -125,9 +127,9 @@
         <!-- copy install scripts, etc. -->\r
         <copy todir="${services.trunk}/${dist.installer.services}/vocabulary">\r
             <fileset dir="${basedir}/installer/"/>\r
-        </copy>        \r
-        <ant antfile="3rdparty/build.xml" target="dist_installer" inheritall="false"/>        \r
-        <ant antfile="import/build.xml" target="dist_installer" inheritall="false"/>        \r
+        </copy>\r
+        <ant antfile="3rdparty/build.xml" target="dist_installer" inheritall="false"/>\r
+        <ant antfile="import/build.xml" target="dist_installer" inheritall="false"/>\r
     </target>\r
 \r
 </project>\r