From d095695e66eafb7314f97a33a50eda1316a356fc Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Fri, 27 Apr 2007 07:09:14 +0000
Subject: [PATCH] This is is the last part of the replication renaming (issue 1090) and is the renaming of the configuration.

---
 opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
index cedc341..d93cb84 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/replication/server/ReplicationServer.java
@@ -29,7 +29,6 @@
 import static org.opends.server.loggers.Error.logError;
 import static org.opends.server.messages.MessageHandler.getMessage;
 import static org.opends.server.messages.ReplicationMessages.*;
-import static org.opends.server.util.ServerConstants.*;
 import static org.opends.server.util.StaticUtils.getFileForPath;
 
 import java.io.File;
@@ -46,7 +45,7 @@
 import java.util.Set;
 
 import org.opends.server.admin.server.ConfigurationChangeListener;
-import org.opends.server.admin.std.server.ChangelogServerCfg;
+import org.opends.server.admin.std.server.ReplicationServerCfg;
 import org.opends.server.api.ConfigurableComponent;
 import org.opends.server.api.DirectoryThread;
 import org.opends.server.config.ConfigAttribute;
@@ -73,7 +72,7 @@
  */
 public class ReplicationServer
   implements Runnable, ConfigurableComponent,
-             ConfigurationChangeListener<ChangelogServerCfg>
+             ConfigurationChangeListener<ReplicationServerCfg>
 {
   private short serverId;
   private String serverURL;
@@ -95,7 +94,7 @@
 
   private String localURL = "null";
   private boolean shutdown = false;
-  private short changelogServerId;
+  private short replicationServerId;
   private DN configDn;
   private List<ConfigAttribute> configAttributes =
           new ArrayList<ConfigAttribute>();
@@ -112,19 +111,19 @@
    * @param configuration The configuration of this replication server.
    * @throws ConfigException When Configuration is invalid.
    */
-  public ReplicationServer(ChangelogServerCfg configuration)
+  public ReplicationServer(ReplicationServerCfg configuration)
          throws ConfigException
   {
     shutdown = false;
     runListen = true;
-    int changelogPort = configuration.getChangelogPort();
-    changelogServerId = (short) configuration.getChangelogServerId();
-    replicationServers = configuration.getChangelogServer();
+    int replicationPort = configuration.getReplicationPort();
+    replicationServerId = (short) configuration.getReplicationServerId();
+    replicationServers = configuration.getReplicationServer();
     if (replicationServers == null)
       replicationServers = new ArrayList<String>();
     queueSize = configuration.getQueueSize();
-    trimAge = configuration.getChangelogPurgeDelay();
-    dbDirname = configuration.getChangelogDbDirectory();
+    trimAge = configuration.getReplicationPurgeDelay();
+    dbDirname = configuration.getReplicationDbDirectory();
     rcvWindow = configuration.getWindowSize();
     if (dbDirname == null)
     {
@@ -145,7 +144,7 @@
           e.getMessage() + " " + getFileForPath(dbDirname));
     }
 
-    initialize(changelogServerId, changelogPort);
+    initialize(replicationServerId, replicationPort);
     configuration.addChangeListener(this);
   }
 
@@ -248,7 +247,7 @@
        */
       for (ReplicationCache replicationCache: baseDNs.values())
       {
-        Set<String> connectedChangelogs = replicationCache.getChangelogs();
+        Set<String> connectedReplServers = replicationCache.getChangelogs();
         /*
          * check that all replication server in the config are in the connected
          * Set. If not create the connection
@@ -256,7 +255,7 @@
         for (String serverURL : replicationServers)
         {
           if ((serverURL.compareTo(this.serverURL) != 0) &&
-              (!connectedChangelogs.contains(serverURL)))
+              (!connectedReplServers.contains(serverURL)))
           {
             this.connect(serverURL, replicationCache.getBaseDn());
           }
@@ -474,9 +473,9 @@
    * @return true if the configuration is acceptable, false other wise.
    */
   public static boolean isConfigurationAcceptable(
-      ChangelogServerCfg configuration, List<String> unacceptableReasons)
+      ReplicationServerCfg configuration, List<String> unacceptableReasons)
   {
-    int port = configuration.getChangelogPort();
+    int port = configuration.getReplicationPort();
 
     try
     {
@@ -499,7 +498,7 @@
    * {@inheritDoc}
    */
   public ConfigChangeResult applyConfigurationChange(
-      ChangelogServerCfg configuration)
+      ReplicationServerCfg configuration)
   {
     // TODO : implement this
     return new ConfigChangeResult(ResultCode.SUCCESS, false);
@@ -509,7 +508,7 @@
    * {@inheritDoc}
    */
   public boolean isConfigurationChangeAcceptable(
-      ChangelogServerCfg configuration, List<String> unacceptableReasons)
+      ReplicationServerCfg configuration, List<String> unacceptableReasons)
   {
     // TODO : implement this
     return true;

--
Gitblit v1.10.0