From 7c30dbb5403772b323df3ad907d9ed15d23b5aee Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 20:35:40 +0000
Subject: [PATCH] Last batch of changes for this week. This adds support for the IETF based Password Policy for LDAP as SubEntry. Also resolves the following issues : - 4544 : initializeBackend() should not set JE env config params directly. - 4478 : ECL in draft compat mode / search lastchangenumber can be very long - 4538 : Virtual attributes not retrieved when entry cache configured - 4547 : Search Filter Matching differ for cn=Directory Manager and plain user. - 4514 : Logs shows unexpected message with replication monitoring data missing (Partial fix) - 4534 : Replication using security does not work after server restart - 4516 : SEVERE_ERROR: servers (...) have the same ServerId In addition, they also improve reliability and performance in various areas including CollectiveAttributes, Virtual Attributes and Subentries management, Schema loading, Replication...
---
opends/tests/staf-tests/shared/staf/staf-controller.cfg | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/opends/tests/staf-tests/shared/staf/staf-controller.cfg b/opends/tests/staf-tests/shared/staf/staf-controller.cfg
index 0f5b9f0..1c4a643 100644
--- a/opends/tests/staf-tests/shared/staf/staf-controller.cfg
+++ b/opends/tests/staf-tests/shared/staf/staf-controller.cfg
@@ -21,7 +21,10 @@
# CDDL HEADER END
#
#
-# Copyright 2007-2009 Sun Microsystems, Inc.
+# Copyright 2007-2010 Sun Microsystems, Inc.
+
+# Change default data directory
+SET DATADIR {STAF/Config/STAFRoot}/data-${local.hostname}
# Turn on tracing of internal errors and deprecated options
trace enable tracepoints "error deprecated"
@@ -32,23 +35,20 @@
# Set default local trust
trust machine local://local level 5
trust level 5 machine tcp://localhost
-# this is required for the Zip Service to be able to expand archives
+
+# This is required for the Zip Service to be able to expand archives
trust level 5 user anonymous
# Default Service Loader Service
serviceloader library STAFDSLS
-# LOG SERVICE CONFIGURATION
-SERVICE Log LIBRARY STAFLog \
- PARMS "Directory {STAF/Config/STAFRoot}/logs"
-
# ZIP SERVICE CONFIGURATION
SERVICE Zip LIBRARY STAFZip
# STAX SERVICE CONFIGURATION
SERVICE Stax LIBRARY JSTAF \
EXECUTE ${staf.install.dir}/${stax.name}/STAX.jar \
- OPTION JVMNAME=stafJVM-${local.hostname} \
+ OPTION JVMNAME=staxJVM-${local.hostname} \
OPTION J2=-Xms1g -Xmx1g \
-XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled \
-XX:+CMSClassUnloadingEnabled -XX:NewSize=500m -XX:MaxNewSize=500m \
@@ -58,15 +58,18 @@
# EVENT SERVICE CONFIGURATION
SERVICE Event LIBRARY JSTAF \
- EXECUTE ${staf.install.dir}/${event.name}/STAFEvent.jar
+ EXECUTE ${staf.install.dir}/${event.name}/STAFEvent.jar \
+ OPTION JVMNAME=eventJVM-${local.hostname}
# EVENTMANAGER SERVICE CONFIGURATION
SERVICE EventManager LIBRARY JSTAF \
- EXECUTE ${staf.install.dir}/${eventmanager.name}/STAFEventManager.jar
+ EXECUTE ${staf.install.dir}/${eventmanager.name}/STAFEventManager.jar \
+ OPTION JVMNAME=eventmanagerJVM-${local.hostname}
# EMAIL SERVICE CONFIGURATION
SERVICE Email LIBRARY JSTAF \
EXECUTE ${staf.install.dir}/${email.name}/STAFEmail.jar \
+ OPTION JVMNAME=emailJVM-${local.hostname} \
PARMS "MAILSERVER ${email.server.host} PORT ${email.server.port}"
SET MAXQUEUESIZE 10000
--
Gitblit v1.10.0