From 595406210f5f3b4ef7c4c43f626a61fe436e0980 Mon Sep 17 00:00:00 2001 From: Laurent Cohen Date: Fri, 20 Apr 2018 23:00:49 +0200 Subject: [PATCH] issue JPPF-436 fixed typos in Readme and javadoc, removed unused code --- jmxremote-nio/README.md | 2 +- .../org/jppf/jmxremote/message/JMXMessageHandler.java | 2 -- .../org/jppf/jmxremote/message/JMXMessageType.java | 10 ---------- .../src/java/org/jppf/jmxremote/nio/ChannelsPair.java | 9 --------- 4 files changed, 1 insertion(+), 22 deletions(-) diff --git a/jmxremote-nio/README.md b/jmxremote-nio/README.md index c97902ba1b..a7640fb991 100644 --- a/jmxremote-nio/README.md +++ b/jmxremote-nio/README.md @@ -59,7 +59,7 @@ JMX service URLs are in the form `service:jmx:jppf://:` #### Authentication and authorization -Authentication is provided as an instance of [JMXAuthenticator](https://docs.oracle.com/javase/7/docs/api/index.html?javax/management/remote/JMXAuthenticator.html), passed on via the server environment property `jmx.remote.authenticator` (also Java the constant [JMXConnectorServer.AUTHENTICATOR](https://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXConnectorServer.html#AUTHENTICATOR)). +Authentication is provided as an instance of [JMXAuthenticator](https://docs.oracle.com/javase/7/docs/api/index.html?javax/management/remote/JMXAuthenticator.html), passed on via the server environment property `jmx.remote.authenticator` (also the Java constant [JMXConnectorServer.AUTHENTICATOR](https://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXConnectorServer.html#AUTHENTICATOR)). On the client side, credentials are passed as a user-defined object via the connector environment property `jmx.remote.credentials` (also the Java constant [JMXConnector.CREDENTIALS](https://docs.oracle.com/javase/7/docs/api/javax/management/remote/JMXConnector.html#CREDENTIALS)). diff --git a/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageHandler.java b/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageHandler.java index 355542f7b7..67e4694081 100644 --- a/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageHandler.java +++ b/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageHandler.java @@ -87,8 +87,6 @@ public JMXMessageHandler(final ChannelsPair channels, final Map env) this.server = channels.readingContext().getServer(); this.mgr = this.server.getTransitionManager(); this.requestTimeout = JMXEnvHelper.getLong(JPPFProperties.JMX_REMOTE_REQUEST_TIMEOUT, env, JPPFConfiguration.getProperties()); - //connectionRequest = channels.isServerSide() ? null : new JMXRequest(CONNECTION_MESSAGE_ID, JMXMessageType.CONNECT); - //if (connectionRequest != null) putRequest(connectionRequest); } /** diff --git a/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageType.java b/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageType.java index f88ed0d98a..9eef979490 100644 --- a/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageType.java +++ b/jmxremote-nio/src/java/org/jppf/jmxremote/message/JMXMessageType.java @@ -139,14 +139,6 @@ public class JMXMessageType { * Identifier for a notification. */ public static final byte NOTIFICATION = 28; - /** - * Identifier for a notification. - */ - public static final byte LOGIN = 29; - /** - * Identifier for a notification. - */ - public static final byte LOGOUT = 30; /** * A non-modifiable mapping of type values to readable names. */ @@ -195,8 +187,6 @@ private static Map initTypeNames() { map.put(SET_ATTRIBUTES, "SET_ATTRIBUTES"); map.put(UNREGISTER_MBEAN, "UNREGISTER_MBEAN"); map.put(NOTIFICATION, "NOTIFICATION"); - map.put(LOGIN, "LOGIN"); - map.put(LOGOUT, "LOGOUT"); return map; } } diff --git a/jmxremote-nio/src/java/org/jppf/jmxremote/nio/ChannelsPair.java b/jmxremote-nio/src/java/org/jppf/jmxremote/nio/ChannelsPair.java index 26a77052ad..1d57805a8c 100644 --- a/jmxremote-nio/src/java/org/jppf/jmxremote/nio/ChannelsPair.java +++ b/jmxremote-nio/src/java/org/jppf/jmxremote/nio/ChannelsPair.java @@ -110,15 +110,6 @@ public class ChannelsPair extends Pair { */ private Subject subject; - /** - * @param first the reading channel. - * @param second the writing channel. - * @param server the JMX nio server. - */ - public ChannelsPair(final JMXContext first, final JMXContext second, final JMXNioServer server) { - this(first, second, server, null); - } - /** * @param first the reading channel. * @param second the writing channel.