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/src/server/org/opends/server/replication/server/ReplicationServer.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index 7781781..4c4b9ba 100644
--- a/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -161,7 +161,7 @@
replicationServers = new ArrayList<String>();
queueSize = configuration.getQueueSize();
trimAge = configuration.getReplicationPurgeDelay();
- dbDirname = configuration.getReplicationDbDirectory();
+ dbDirname = configuration.getReplicationDBDirectory();
rcvWindow = configuration.getWindowSize();
if (dbDirname == null)
{
@@ -668,8 +668,8 @@
}
}
- if ((configuration.getReplicationDbDirectory() != null) &&
- (!dbDirname.equals(configuration.getReplicationDbDirectory())))
+ if ((configuration.getReplicationDBDirectory() != null) &&
+ (!dbDirname.equals(configuration.getReplicationDBDirectory())))
{
return new ConfigChangeResult(ResultCode.SUCCESS, true);
}
@@ -815,15 +815,15 @@
"dn: ds-cfg-backend-id="+backendId+",cn=Backends,cn=config",
"objectClass: top",
"objectClass: ds-cfg-backend",
- "objectClass: ds-cfg-je-backend",
- "ds-cfg-backend-base-dn: dc="+backendId,
- "ds-cfg-backend-enabled: true",
- "ds-cfg-backend-writability-mode: enabled",
- "ds-cfg-backend-class: " +
+ "objectClass: ds-cfg-local-db-backend",
+ "ds-cfg-base-dn: dc="+backendId,
+ "ds-cfg-enabled: true",
+ "ds-cfg-writability-mode: enabled",
+ "ds-cfg-java-class: " +
"org.opends.server.replication.server.ReplicationBackend",
"ds-cfg-backend-id: " + backendId,
- "ds-cfg-backend-import-temp-directory: importTmp",
- "ds-cfg-backend-directory: " + getFileForPath(dbDirname));
+ "ds-cfg-import-temp-directory: importTmp",
+ "ds-cfg-db-directory: " + getFileForPath(dbDirname));
LDIFImportConfig ldifImportConfig = new LDIFImportConfig(
new StringReader(ldif));
--
Gitblit v1.10.0