From 86ad6a08499797f9b3204896caee947abb03394f Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 07 Nov 2016 13:59:40 +0000
Subject: [PATCH] OPENDJ-3179: Migrate LDAP Connection Handler to SDK Grizzly transport
---
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
index d0bf186..7fc2a37 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestLDAPConnectionHandler.java
@@ -32,6 +32,7 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.reactive.LDAPConnectionHandler2;
import org.opends.server.types.Attributes;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.Entry;
@@ -73,12 +74,12 @@
"objectClass: ds-cfg-connection-handler",
"objectClass: ds-cfg-ldap-connection-handler",
"cn: LDAP Connection Handler",
- "ds-cfg-java-class: org.opends.server.protocols.ldap.LDAPConnectionHandler",
+ "ds-cfg-java-class: org.forgerock.opendj.reactive.LDAPConnectionHandler2",
"ds-cfg-enabled: true",
"ds-cfg-listen-address: 0.0.0.0",
"ds-cfg-accept-backlog: 128",
"ds-cfg-allow-ldap-v2: false",
- "ds-cfg-keep-stats: false",
+ "ds-cfg-keep-stats: true",
"ds-cfg-use-tcp-keep-alive: true",
"ds-cfg-use-tcp-no-delay: true",
"ds-cfg-allow-tcp-reuse-address: true",
@@ -91,10 +92,9 @@
"ds-cfg-ssl-cert-nickname: server-cert",
"ds-cfg-key-manager-provider: cn=JKS,cn=Key Manager Providers,cn=config",
"ds-cfg-trust-manager-provider: cn=JKS,cn=Trust Manager Providers,cn=config");
- LDAPConnectionHandler LDAPConnHandler=getLDAPHandlerInstance(LDAPHandlerEntry);
+ LDAPConnectionHandler2 LDAPConnHandler=getLDAPHandlerInstance(LDAPHandlerEntry);
LDAPConnHandler.allowLDAPv2();
LDAPConnHandler.allowStartTLS();
- LDAPConnHandler.keepStats();
LDAPConnHandler.toString(new StringBuilder());
LDAPConnHandler.toString();
LDAPStatistics tracker=LDAPConnHandler.getStatTracker();
@@ -118,7 +118,7 @@
Attribute startTls1=Attributes.create(ATTR_ALLOW_STARTTLS, String.valueOf(false));
LDAPHandlerEntry.addAttribute(useSSL1,null);
LDAPHandlerEntry.addAttribute(startTls1,null);
- LDAPConnectionHandler LDAPSConnHandler = getLDAPHandlerInstance(LDAPHandlerEntry);
+ LDAPConnectionHandler2 LDAPSConnHandler = getLDAPHandlerInstance(LDAPHandlerEntry);
LDAPSConnHandler.finalizeConnectionHandler(reasonMsg);
LDAPConnHandler.processServerShutdown(reasonMsg);
}
@@ -209,7 +209,7 @@
"objectClass: ds-cfg-connection-handler",
"objectClass: ds-cfg-ldap-connection-handler",
"cn: LDAP Connection Handler",
- "ds-cfg-java-class: org.opends.server.protocols.ldap.LDAPConnectionHandler",
+ "ds-cfg-java-class: org.forgerock.opendj.reactive.LDAPConnectionHandler2",
"ds-cfg-enabled: true",
"ds-cfg-listen-address: 0.0.0.0",
"ds-cfg-accept-backlog: 128",
@@ -227,7 +227,7 @@
"ds-cfg-ssl-cert-nickname: server-cert",
"ds-cfg-key-manager-provider: cn=JKS,cn=Key Manager Providers,cn=config",
"ds-cfg-trust-manager-provider: cn=JKS,cn=Trust Manager Providers,cn=config");
- LDAPConnectionHandler LDAPConnHandler=getLDAPHandlerInstance(GoodHandlerEntry);
+ LDAPConnectionHandler2 LDAPConnHandler=getLDAPHandlerInstance(GoodHandlerEntry);
//Make attrTypes to remove
AttributeType at0=DirectoryServer.getSchema().getAttributeType(ATTR_LISTEN_PORT);
// AttributeType at1=DirectoryServer.getAttributeType(ATTR_LISTEN_ADDRESS, true);
--
Gitblit v1.10.0