From 6b86ac59664e9660e4f5345f5596b0c8b889f782 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 13 Jun 2007 21:56:23 +0000
Subject: [PATCH] Issue 1784 data and temporary files must go into a unique folder

---
 opendj-sdk/opends/tests/functional-tests/config/config.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/opendj-sdk/opends/tests/functional-tests/config/config.py b/opendj-sdk/opends/tests/functional-tests/config/config.py
index 40fd9e1..9819b74 100644
--- a/opendj-sdk/opends/tests/functional-tests/config/config.py
+++ b/opendj-sdk/opends/tests/functional-tests/config/config.py
@@ -3,12 +3,10 @@
 TEST_JVM_STRING             = 'JVM_STRING'
 STAF_LOCAL_HOSTNAME         = 'localhost'
 STAF_REMOTE_HOSTNAME        = 'localhost'
-STAF_JAVA_HOME              = '/usr/jdk/jdk1.5.0'
-STAF_HOME_DIR               = '/usr/local/staf'
 TMPDIR                      = '/tmp'
 PSWDFILE                    = '/tmp/password'
 OPENDSDIR                   = '/home/username/trunk/opends'
-OPENDSNAME                  = 'OpenDS-0.1'
+OPENDSNAME                  = 'OpenDS-0.9.0'
 ZIPNAME                     = '%s.zip' % OPENDSNAME
 ZIPPATH                     = '%s/build/package' % OPENDSDIR
 TESTS_DIR                   = '%s/tests/functional-tests' % OPENDSDIR
@@ -17,7 +15,6 @@
 TESTS_FUNCTIONS_DIR         = '%s/functions' % TESTS_SHARED_DIR
 TESTS_DATA_DIR              = '%s/data' % TESTS_SHARED_DIR
 TESTS_JAVA_DIR		    = '%s/java' % TESTS_SHARED_DIR
-TMP_DATA_DIR                = '%s/functional-tests' % TMPDIR
 DIRECTORY_INSTANCE_DN       = 'cn=Directory Manager'
 DIRECTORY_INSTANCE_PSWD     = 'password'
 DIRECTORY_INSTANCE_DIR      = '/tmp'
@@ -26,9 +23,7 @@
 DIRECTORY_INSTANCE_SSL_PORT = '1636'
 DIRECTORY_INSTANCE_SFX      = 'dc=com'
 DIRECTORY_INSTANCE_BE       = 'userRoot'
-STAGED_DATA_DIR             = '%s/functional-tests/shared/data' % DIRECTORY_INSTANCE_DIR
-LOCAL_DATA_DIR		    = '%s/functional-tests/shared/data' % TMPDIR
-JAVA_HOME                   = '/usr/jdk/jdk1.5.0_01'
+JAVA_HOME                   = '/usr/jdk/latest'
 LOGS_ROOT                   = '%s' % TMPDIR
 LOGS_URI                    = ''
 SEND_MAIL_AFTER_TEST_RUN    = 'FALSE'

--
Gitblit v1.10.0