From d04fb0f282e0fd9a4bc80d3f9d5ee15506a3b83b Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Dec 2008 08:03:33 +0000
Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk
---
opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java b/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
index a94d979..778ad65 100644
--- a/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
+++ b/opends/src/server/org/opends/server/replication/protocol/ReplSessionSecurity.java
@@ -31,8 +31,6 @@
import static org.opends.messages.ReplicationMessages.*;
import org.opends.messages.Message;
-import org.opends.server.admin.std.server.ReplicationServerCfg;
-import org.opends.server.admin.std.server.ReplicationDomainCfg;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.CryptoManager;
import org.opends.server.config.ConfigException;
@@ -132,32 +130,12 @@
}
/**
- * Create a ReplSessionSecurity instance from a provided replication server
- * configuration.
- *
- * @param replServerCfg The replication server configuration.
- *
- * @throws ConfigException If the supplied configuration was not valid.
- */
- public ReplSessionSecurity(ReplicationServerCfg replServerCfg)
- throws ConfigException
- {
- // Currently use global settings from the crypto manager.
- this(DirectoryConfig.getCryptoManager().getSslCertNickname(),
- DirectoryConfig.getCryptoManager().getSslProtocols(),
- DirectoryConfig.getCryptoManager().getSslCipherSuites(),
- DirectoryConfig.getCryptoManager().isSslEncryption());
- }
-
- /**
* Create a ReplSessionSecurity instance from a provided multimaster domain
* configuration.
*
- * @param multimasterDomainCfg The multimaster domain configuration.
- *
* @throws ConfigException If the supplied configuration was not valid.
*/
- public ReplSessionSecurity(ReplicationDomainCfg multimasterDomainCfg)
+ public ReplSessionSecurity()
throws ConfigException
{
// Currently use global settings from the crypto manager.
--
Gitblit v1.10.0