From 9329dbf0d7d11bac6c8e568667b6c11e4ffcdd8d Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 05 Jun 2013 12:53:31 +0000
Subject: [PATCH] CR-1789 Added mode to run tests from upgraded instance => fixed regression introduced in previous commit :
---
opends/tests/staf-tests/shared/functions/topology.xml | 4 ++--
opends/tests/staf-tests/shared/ant/build.properties | 13 ++++++++-----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/opends/tests/staf-tests/shared/ant/build.properties b/opends/tests/staf-tests/shared/ant/build.properties
index 9a8aecb..90d22e3 100644
--- a/opends/tests/staf-tests/shared/ant/build.properties
+++ b/opends/tests/staf-tests/shared/ant/build.properties
@@ -35,16 +35,17 @@
# Archives section
staf.default=true
staf.url=http://prdownloads.sourceforge.net/sourceforge/staf
-staf.version=347
+staf.version=3413
staf.port=6500
stax.version=345
-email.version=336
-event.version=314
+#stax.version=355
+email.version=337
+event.version=315
eventmanager.version=340
-http.version=303
+http.version=304
wc.type=tomcat
-tomcat.version=6.0.32
+tomcat.version=6.0.36
glassfish.version=v3
sunwebserver.url=
sunwebserver.version=7_0u6
@@ -123,3 +124,5 @@
original.archive=${default.opends.dir}/${default.opends.name}.zip
replication.split=false
replication.eclmode=n/a
+upgrade.opendj.name=
+upgrade.opendj.dir=
diff --git a/opends/tests/staf-tests/shared/functions/topology.xml b/opends/tests/staf-tests/shared/functions/topology.xml
index 6b338d1..a131c5e 100755
--- a/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opends/tests/staf-tests/shared/functions/topology.xml
@@ -434,7 +434,7 @@
</else>
</if>
- <if expr="UPGRADE_ZIPNAME == ''">
+ <if expr="UPGRADE_OPENDJNAME == ''">
<sequence>
<!-- *********** -->
<!-- NORMAL MODE -->
@@ -608,7 +608,7 @@
<!-- ******* -->
<!-- UPGRADE -->
<!-- ******* -->
- <if expr="UPGRADE_ZIPNAME != ''">
+ <if expr="UPGRADE_OPENDJNAME != ''">
<sequence>
<!-- Copy content of new version into old version -->
<!-- Install DS Extract zip file -->
--
Gitblit v1.10.0