From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/tests/functional-tests/shared/functions/dsconfig.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/dsconfig.xml b/opends/tests/functional-tests/shared/functions/dsconfig.xml
index 8a4c75e..6c3fb62 100755
--- a/opends/tests/functional-tests/shared/functions/dsconfig.xml
+++ b/opends/tests/functional-tests/shared/functions/dsconfig.xml
@@ -122,7 +122,7 @@
<function-arg-def name="attributeName" type="required">
<function-arg-description>
- Attribute to modify, e.g. minimum-password-length
+ Attribute to modify, e.g. min-password-length
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
@@ -280,7 +280,7 @@
<function-arg-def name="attributeName" type="required">
<function-arg-description>
- Attribute to get, e.g. minimum-password-length
+ Attribute to get, e.g. min-password-length
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
@@ -564,7 +564,7 @@
<function-arg-def name="attributeName" type="required">
<function-arg-description>
- Attribute to modify, e.g. minimum-password-length
+ Attribute to modify, e.g. min-password-length
</function-arg-description>
<function-arg-property name="type" value="string" />
</function-arg-def>
@@ -1317,7 +1317,7 @@
dsconfigCmd=''
dsBinPath='%s/%s' % (dsPath,fileFolder)
dsconfigCmd='%s/%s%s' % (dsBinPath,DSCONFIG,fileExt)
- dsconfigParams = 'create-je-index -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --set index-type:%s' % (host,port,rootDN,rootPwd,backendID, indexAttribute, ' --set index-type:'.join(indexTypes))
+ dsconfigParams = 'create-local-db-index -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --set index-type:%s' % (host,port,rootDN,rootPwd,backendID, indexAttribute, ' --set index-type:'.join(indexTypes))
</script>
<call function="'_dsconfigCommonArgs'" />
@@ -1448,7 +1448,7 @@
operationArguments = indexProperty
if indexPropertyValue:
operationArguments = '%s:%s' % (indexProperty, indexPropertyValue)
- dsconfigParams = 'set-je-index-prop -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --%s %s' % ( host, port, rootDN, rootPwd, backendID, indexAttribute, operation, operationArguments )
+ dsconfigParams = 'set-local-db-index-prop -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s --%s %s' % ( host, port, rootDN, rootPwd, backendID, indexAttribute, operation, operationArguments )
</script>
<call function="'_dsconfigCommonArgs'" />
<call function="'runCommand'">
@@ -1546,7 +1546,7 @@
dsconfigCmd=''
dsBinPath='%s/%s' % (dsPath,fileFolder)
dsconfigCmd='%s/%s%s' % (dsBinPath,DSCONFIG,fileExt)
- dsconfigParams = 'delete-je-index -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s' % (host,port,rootDN,rootPwd,backendID, indexAttribute)
+ dsconfigParams = 'delete-local-db-index -n -h %s -p %s -D "%s" -w %s --backend-name %s --index-name %s' % (host,port,rootDN,rootPwd,backendID, indexAttribute)
</script>
<call function="'_dsconfigCommonArgs'" />
<call function="'runCommand'">
@@ -2043,7 +2043,7 @@
STAFCmdParamsList.append('create-multimaster-domain')
STAFCmdParamsList.append('--provider-name "%s"' % providerName)
STAFCmdParamsList.append('--domain-name "%s"' % domainName)
- STAFCmdParamsList.append('--set "replication-dn:%s"' % replicationDn)
+ STAFCmdParamsList.append('--set "base-dn:%s"' % replicationDn)
STAFCmdParamsList.append('--set "server-id:%s"' % serverId)
for replServer in replicationServerList :
--
Gitblit v1.10.0