summaryrefslogtreecommitdiff
path: root/cc/config.xml
diff options
context:
space:
mode:
Diffstat (limited to 'cc/config.xml')
-rw-r--r--cc/config.xml19
1 files changed, 13 insertions, 6 deletions
diff --git a/cc/config.xml b/cc/config.xml
index 9db8b2754f..2436cec1ca 100644
--- a/cc/config.xml
+++ b/cc/config.xml
@@ -18,10 +18,17 @@ under the License.
-->
<cruisecontrol>
- <include.projects file="./config/cpp-trunk.xml"/>
- <include.projects file="./config/java-trunk.xml"/>
- <include.projects file="./config/bdbstore-cpp-trunk.xml"/>
- <include.projects file="./config/cpp-trunk-perftests.xml"/>
- <include.projects file="./config/example-automation.xml"/>
- <include.projects file="./config/java-perftests.xml"/>
+ <!-- Load environment variables -->
+ <property environment="env" toupper="true"/>
+
+ <!-- Set a collection of global properties from the properties file "config.properties" -->
+ <property file="config.properties"/>
+
+ <include.projects file="./config/cpp-trunk.xml"/>
+ <include.projects file="./config/java-trunk.xml"/>
+ <include.projects file="./config/bdbstore-cpp-trunk.xml"/>
+ <include.projects file="./config/cpp-perftests.xml"/>
+ <include.projects file="./config/example-automation.xml"/>
+ <include.projects file="./config/java-perftests.xml"/>
+ <include.projects file="./config/java-jmstck.xml"/>
</cruisecontrol>