OpenJDK / panama / dev
changeset 29099:766801b4d95d
8062750: Separate SNMP messages from sun.management.resources.agent
Reviewed-by: alanb, dfuchs, erikj
| author | mchung |
|---|---|
| date | Mon, 23 Feb 2015 08:46:07 -0800 |
| parents | fd65e2764b56 |
| children | 56267f38f743 1698800c8606 |
| files | jdk/src/java.management/share/classes/sun/management/AgentConfigurationError.java jdk/src/java.management/share/classes/sun/management/resources/agent.properties jdk/test/sun/management/AgentCheckTest.java |
| diffstat | 3 files changed, 0 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.management/share/classes/sun/management/AgentConfigurationError.java Mon Feb 23 17:22:56 2015 +0000 +++ b/jdk/src/java.management/share/classes/sun/management/AgentConfigurationError.java Mon Feb 23 08:46:07 2015 -0800 @@ -87,26 +87,6 @@ "agent.err.connector.server.io.error"; public static final String INVALID_OPTION = "agent.err.invalid.option"; - public static final String INVALID_SNMP_PORT = - "agent.err.invalid.snmp.port"; - public static final String INVALID_SNMP_TRAP_PORT = - "agent.err.invalid.snmp.trap.port"; - public static final String UNKNOWN_SNMP_INTERFACE = - "agent.err.unknown.snmp.interface"; - public static final String SNMP_ACL_FILE_NOT_SET = - "agent.err.acl.file.notset"; - public static final String SNMP_ACL_FILE_NOT_FOUND = - "agent.err.acl.file.notfound"; - public static final String SNMP_ACL_FILE_NOT_READABLE = - "agent.err.acl.file.not.readable"; - public static final String SNMP_ACL_FILE_READ_FAILED = - "agent.err.acl.file.read.failed"; - public static final String SNMP_ACL_FILE_ACCESS_NOT_RESTRICTED = - "agent.err.acl.file.access.notrestricted"; - public static final String SNMP_ADAPTOR_START_FAILED = - "agent.err.snmp.adaptor.start.failed"; - public static final String SNMP_MIB_INIT_FAILED = - "agent.err.snmp.mib.init.failed"; public static final String INVALID_STATE = "agent.err.invalid.state";
--- a/jdk/src/java.management/share/classes/sun/management/resources/agent.properties Mon Feb 23 17:22:56 2015 +0000 +++ b/jdk/src/java.management/share/classes/sun/management/resources/agent.properties Mon Feb 23 08:46:07 2015 -0800 @@ -1,4 +1,3 @@ -# # # Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,9 +23,6 @@ # questions. # -# Localizations for Level names. For the US locale -# these are the same as the non-localized level name. - agent.err.error = Error agent.err.exception = Exception thrown by the agent agent.err.warning = Warning @@ -67,27 +63,9 @@ agent.err.connector.server.io.error = JMX connector server communication error agent.err.invalid.option = Invalid option specified -agent.err.invalid.snmp.port = Invalid com.sun.management.snmp.port number -agent.err.invalid.snmp.trap.port = Invalid com.sun.management.snmp.trap number -agent.err.unknown.snmp.interface = Unknown SNMP interface -agent.err.acl.file.notset = No SNMP ACL file is specified but com.sun.management.snmp.acl=true -agent.err.acl.file.notfound = SNMP ACL file not found -agent.err.acl.file.not.readable = SNMP ACL file not readable -agent.err.acl.file.read.failed = Failed in reading SNMP ACL file -agent.err.acl.file.access.notrestricted = Password file read access must be restricted - -agent.err.snmp.adaptor.start.failed = Failed to start SNMP adaptor with address -agent.err.snmp.mib.init.failed = Failed to initialize SNMP MIB with error jmxremote.ConnectorBootstrap.starting = Starting JMX Connector Server: jmxremote.ConnectorBootstrap.noAuthentication = No Authentication jmxremote.ConnectorBootstrap.ready = JMX Connector ready at: {0} jmxremote.ConnectorBootstrap.password.readonly = Password file read access must be restricted: {0} jmxremote.ConnectorBootstrap.file.readonly = File read access must be restricted: {0} - -jmxremote.AdaptorBootstrap.getTargetList.processing = Processing ACL -jmxremote.AdaptorBootstrap.getTargetList.adding = Adding target: {0} -jmxremote.AdaptorBootstrap.getTargetList.starting = Starting Adaptor Server: -jmxremote.AdaptorBootstrap.getTargetList.initialize1 = Adaptor ready. -jmxremote.AdaptorBootstrap.getTargetList.initialize2 = SNMP Adaptor ready on: {0}:{1} -jmxremote.AdaptorBootstrap.getTargetList.terminate = terminate {0}
--- a/jdk/test/sun/management/AgentCheckTest.java Mon Feb 23 17:22:56 2015 +0000 +++ b/jdk/test/sun/management/AgentCheckTest.java Mon Feb 23 08:46:07 2015 -0800 @@ -39,12 +39,6 @@ {"jmxremote.ConnectorBootstrap.noAuthentication", "", ""}, {"jmxremote.ConnectorBootstrap.ready", "Phony JMXServiceURL", ""}, {"jmxremote.ConnectorBootstrap.password.readonly", "Phony passwordFileName", ""}, - {"jmxremote.AdaptorBootstrap.getTargetList.processing", "", ""}, - {"jmxremote.AdaptorBootstrap.getTargetList.adding", "Phony target", ""}, - {"jmxremote.AdaptorBootstrap.getTargetList.starting", "", ""}, - {"jmxremote.AdaptorBootstrap.getTargetList.initialize1", "", ""}, - {"jmxremote.AdaptorBootstrap.getTargetList.initialize2", "Phony hostname", "Phony port"}, - {"jmxremote.AdaptorBootstrap.getTargetList.terminate", "Phony exception", ""}, }; boolean pass = true;