CR-1789 Added mode to run tests from upgraded instance => fixed regression ...

Christophe Sovant

05.53.2013 9329dbf0d7d11bac6c8e568667b6c11e4ffcdd8d

CR-1789 Added mode to run tests from upgraded instance
=> fixed regression introduced in previous commit
:

 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=

 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 -->