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/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
index fc7a9bb..9cc8a5a 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/protocols/jmx/JmxConnectTest.java
@@ -217,7 +217,7 @@
// not working at the moment see issue 655
// {"cn=JE
// Database,ds-cfg-backend-id=userRoot,cn=Backends,cn=config",
- // "ds-cfg-database-cache-percent", 10},
+ // "ds-cfg-db-cache-percent", 10},
};
}
@@ -306,8 +306,8 @@
"objectClass: ds-cfg-connection-handler",
"objectClass: ds-cfg-jmx-connection-handler",
"ds-cfg-ssl-cert-nickname: server-cert",
- "ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
- "ds-cfg-connection-handler-enabled: true",
+ "ds-cfg-java-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
+ "ds-cfg-enabled: true",
"ds-cfg-use-ssl: false", "ds-cfg-listen-port: "
+ serverJmxPort, "cn: JMX Connection Handler");
InternalClientConnection connection =
@@ -392,8 +392,8 @@
"objectClass: ds-cfg-connection-handler",
"objectClass: ds-cfg-jmx-connection-handler",
"ds-cfg-ssl-cert-nickname: server-cert",
- "ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
- "ds-cfg-connection-handler-enabled: true",
+ "ds-cfg-java-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
+ "ds-cfg-enabled: true",
"ds-cfg-use-ssl: false", "ds-cfg-listen-port: "
+ serverJmxPort, "cn: JMX Connection Handler");
serverJmxSocket.close();
@@ -416,8 +416,8 @@
"objectClass: ds-cfg-connection-handler",
"objectClass: ds-cfg-jmx-connection-handler",
"ds-cfg-ssl-cert-nickname: server-cert",
- "ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
- "ds-cfg-connection-handler-enabled: true",
+ "ds-cfg-java-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
+ "ds-cfg-enabled: true",
"ds-cfg-use-ssl: false", "ds-cfg-listen-port: "
+ initJmxPort, "cn: JMX Connection Handler");
@@ -450,11 +450,11 @@
"objectClass: ds-cfg-connection-handler",
"objectClass: ds-cfg-jmx-connection-handler",
"ds-cfg-ssl-cert-nickname: server-cert",
- "ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
- "ds-cfg-connection-handler-enabled: true",
+ "ds-cfg-java-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
+ "ds-cfg-enabled: true",
"ds-cfg-use-ssl: true",
"ds-cfg-listen-port: " + initJmxPort,
- "ds-cfg-key-manager-provider-dn: cn=JKS,cn=Key Manager Providers,cn=config",
+ "ds-cfg-key-manager-provider: cn=JKS,cn=Key Manager Providers,cn=config",
"cn: JMX Connection Handler");
configureJmx(entry);
@@ -474,8 +474,8 @@
"objectClass: ds-cfg-connection-handler",
"objectClass: ds-cfg-jmx-connection-handler",
"ds-cfg-ssl-cert-nickname: server-cert",
- "ds-cfg-connection-handler-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
- "ds-cfg-connection-handler-enabled: true",
+ "ds-cfg-java-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
+ "ds-cfg-enabled: true",
"ds-cfg-use-ssl: false", "ds-cfg-listen-port: "
+ initJmxPort, "cn: JMX Connection Handler");
try {
@@ -631,14 +631,14 @@
String jmxName = JMXMBean.getJmxName(testedConnector);
ObjectName name = ObjectName.getInstance(jmxName);
Attribute status = (Attribute) mbsc.getAttribute(name,
- "ds-cfg-connection-handler-enabled");
+ "ds-cfg-enabled");
if (status != null)
status.getValue();
Attribute attr = new Attribute(
- "ds-cfg-connection-handler-enabled", enabled);
+ "ds-cfg-enabled", enabled);
mbsc.setAttribute(name, attr);
status = (Attribute) mbsc.getAttribute(name,
- "ds-cfg-connection-handler-enabled");
+ "ds-cfg-enabled");
status = null;
}
--
Gitblit v1.10.0