From 7252c1c1dba0b7ad4b2e692169da526491994aab Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Fri, 11 Sep 2009 14:48:00 +0000
Subject: [PATCH] Improvements in ant build + update STAF/services versions + dynamic dsmlService compilation/loading
---
opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml | 66 ++++++++++++++------------------
1 files changed, 29 insertions(+), 37 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml
index 7589a97..2cb2684 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/dependencies.xml
@@ -44,47 +44,39 @@
<var name="ext" unset="true"/>
<var name="url" unset="true"/>
- <if>
- <not>
- <available file="${staf.install.dir}/bin/STAF.cfg"/>
- </not>
- <then>
- <trycatch property="error" reference="referror">
- <try>
- <propertyregex property="ext"
- input="@{archive}"
- regexp=".*\.(.*)"
- select="\1"
- casesensitive="false"/>
+ <trycatch property="error" reference="referror">
+ <try>
+ <propertyregex property="ext"
+ input="@{archive}"
+ regexp=".*\.(.*)"
+ select="\1"
+ casesensitive="false"/>
- <echo>Checking @{archive} archive...</echo>
- <switch value="${ext}">
- <case value="gz">
- <!-- gz files -->
- <gunzip src="${archives.dir}/@{archive}"
- dest="${tmp.dir}"/>
- </case>
- <case value="zip">
- <!-- zip files -->
- <unzip src="${archives.dir}/@{archive}"
- dest="${tmp.dir}"/>
- </case>
- <default>
- </default>
- </switch>
+ <echo>Checking @{archive} archive...</echo>
+ <switch value="${ext}">
+ <case value="gz">
+ <!-- gz files -->
+ <gunzip src="${archives.dir}/@{archive}"
+ dest="${tmp.dir}"/>
+ </case>
+ <case value="zip">
+ <!-- zip files -->
+ <unzip src="${archives.dir}/@{archive}"
+ dest="${tmp.dir}"/>
+ </case>
+ <default>
+ </default>
+ </switch>
- <var name="rc" value="0"/>
- </try>
+ <var name="rc" value="0"/>
+ </try>
- <catch>
- <echo>ERROR: ${error}</echo>
- <var name="rc" value="-1"/>
- </catch>
- </trycatch>
- </then>
- </if>
+ <catch>
+ <echo>ERROR: ${error}</echo>
+ <var name="rc" value="-1"/>
+ </catch>
+ </trycatch>
- <var name="rc" value="0"/>
<if>
<or>
<not>
--
Gitblit v1.10.0