CR-1655 Update OpenDJ instance path following modifications for Upgrade

Christophe Sovant

07.19.2013 679adbe8a70f0ee8a8a43d87aca9c3e28b89e036

CR-1655 Update OpenDJ instance path following modifications for Upgrade

 opends/tests/staf-tests/functional-tests/testcases/replication-safe-data/replication-safe-data.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2013 ForgeRock AS
 ! -->
<stax>
  <defaultcall function="main_replication-safe-data"/>
@@ -63,6 +64,7 @@
              commonSuiteList.append('changelog')
              commonSuiteList.append('conflict')
              commonSuiteList.append('externalchangelog')
              commonSuiteList.append('externalchangelog_consistency')
              commonSuiteList.append('aci')
  
              # Safe-data mode specific test suites

 opends/tests/staf-tests/functional-tests/testcases/replication-safe-read/replication-safe-read.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2013 ForgeRock AS
 ! -->
<stax>
  <defaultcall function="main_replication-safe-read"/>
@@ -63,6 +64,7 @@
              commonSuiteList.append('changelog')
              commonSuiteList.append('conflict')
              commonSuiteList.append('externalchangelog')
              commonSuiteList.append('externalchangelog_consistency')
              commonSuiteList.append('aci')
  
              # Safe-read mode specific test suites

 opends/tests/staf-tests/shared/tests/config.py.stubs

@@ -22,6 +22,7 @@
#
#
#      Copyright 2007-2010 Sun Microsystems, Inc.
#      Portions Copyright 2013 Forgerock AS

TEST_OS_STRING                = '${tests.os.string}'
TEST_JVM_STRING               = '${tests.jvm.string}'
@@ -30,7 +31,7 @@
STAF_CLIENT_HOSTNAME          = '${client.hostname}'
TMPDIR                        = '${temp.dir}'
PRODUCTNAME                   = '${product.name}'
OPENDSNAME                    = '${opends.name}'
OPENDSNAME                    = 'opendj'
ZIPNAME                       = '${opends.name}.zip'
ZIPPATH                       = '${opends.dir}'
TESTS_TIMESTAMP               = '${tests.timestamp}'
@@ -74,7 +75,7 @@
WC_HOST                       = '${remote.hostname}'
DSML_WARNAME                  = '${opends.name}-DSML.war'
DSML_WARPATH                  = '${opends.dir}/${opends.name}-DSML.war'
SNMP_OPENDS_JARFILE           = '${opends.name}/lib/extensions/snmp-mib2605.jar'
SNMP_OPENDS_JARFILE           = 'opendj/lib/extensions/snmp-mib2605.jar'
SNMP_OPENDMK_LIBDIR           = '${snmp.opendmk.lib.dir}'
SNMP_OPENDMK_JARFILE          = '${snmp.opendmk.lib.dir}/jdmkrt.jar'
SNMP_PORT                     = '8085'