From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception

---
 opends/tests/staf-tests/shared/tests/config.py.stubs |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/opends/tests/staf-tests/shared/tests/config.py.stubs b/opends/tests/staf-tests/shared/tests/config.py.stubs
index 8b5ef87..4f6e4f9 100644
--- a/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -21,7 +21,7 @@
 # CDDL HEADER END
 #
 #
-#      Copyright 2007-2009 Sun Microsystems, Inc.
+#      Copyright 2007-2010 Sun Microsystems, Inc.
 
 TEST_OS_STRING                = '${tests.os.string}'
 TEST_JVM_STRING               = '${tests.jvm.string}'
@@ -33,6 +33,7 @@
 OPENDSNAME                    = '${opends.name}'
 ZIPNAME                       = '${opends.name}.zip'
 ZIPPATH                       = '${opends.dir}'
+TESTS_TIMESTAMP               = '${tests.timestamp}'
 TESTS_TYPE                    = '${tests.type}'
 TESTS_ROOT                    = '${basedir}'
 TESTS_DIR                     = '${tests.dir}'
@@ -45,8 +46,8 @@
 TESTS_RESOURCE_DIR            = '${shared.dir}/resource'
 DIRECTORY_INSTANCE_DN         = '${opends.admin.dn}'
 DIRECTORY_INSTANCE_PSWD       = '${opends.admin.pwd}'
-DIRECTORY_INSTANCE_BIN        = '${tests.tmp.dir}'
-DIRECTORY_INSTANCE_DIR        = '${tests.tmp.dir}'
+DIRECTORY_INSTANCE_BIN        = '${instance.bin}'
+DIRECTORY_INSTANCE_DIR        = '${instance.dir}'
 DIRECTORY_INSTANCE_HOST       = '${remote.hostname}'
 DIRECTORY_INSTANCE_PORT       = '${opends.port.ldap}'
 DIRECTORY_INSTANCE_ADMIN_PORT = '${opends.port.admin}'
@@ -81,3 +82,4 @@
 LDCLT_DIR                     = '${ldclt.dir}'
 VERBOSE_MODE                  = '${verbose.mode}'
 TEST_PLAN_CUSTOM              = '${test.plan.custom}'
+ORIGINAL_ARCHIVE              = '${original.archive}'

--
Gitblit v1.10.0