From 9dc10dec2d5d7f61116f7f647b7cf9596ca77be0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 05 Jun 2009 09:04:50 +0000
Subject: [PATCH] svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

---
 opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
index 5e7bec7..03d9b37 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/build.properties
@@ -73,6 +73,12 @@
 proxy.user=
 proxy.pass=
 
+# Email section
+email.enabled=false
+email.to=
+email.server.host=emailhost
+email.server.port=25
+
 
 ######
 ## These values can be overrided using the tests-XXX-XXX.properties file
@@ -81,6 +87,7 @@
 # Hostname section
 local.hostname=${host.name}
 remote.hostname=${host.name}
+client.hostname=${host.name}
 
 # Log directory section
 logs.dir=${basedir}/temp/logs
@@ -111,15 +118,11 @@
 opends.admin.dn=cn=myself
 opends.admin.pwd=password
 snmp.opendmk.lib.dir=
+ldclt.dir=
 test.plan.custom=
-test.plan.default=aci,backends,clu,core,dsconfig,dsml,groups,i18n,indexes,logging,monitoring,plugins,privileges,replication,schema,security,setup,snmp,tasks,virtualAttributes
+test.plan.functional.default=aci,backends,clu,core,dsconfig,dsml,groups,i18n,indexes,logging,monitoring,plugins,privileges,replication,schema,security,setup,snmp,tasks,virtualAttributes
+test.plan.stress.default=ldap_operation,import_ldif
 verbose.mode=false
-email.enabled=false
-email.to=
-email.server.host=emailhost
-email.server.port=25
-
+logs.uri=file://
 tests.os.string=${os.name}
 tests.jvm.string=${java.version}(${sun.arch.data.model} bits)
-logs.uri=file://
-email.subject=Results for ${opends.name} on ${remote.hostname}

--
Gitblit v1.10.0