diff options
author | Simone Bordet | 2015-04-13 14:21:48 +0000 |
---|---|---|
committer | Simone Bordet | 2015-04-13 14:21:48 +0000 |
commit | 599ab9bb1bee454f190d964b67859e46a1e57f87 (patch) | |
tree | b729472f7fc361ec6b84526c74cf193c383e77b7 /jetty-jmx | |
parent | d78673f8f824d562bf181fe2aaf929bad6f6e695 (diff) | |
download | org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.gz org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.tar.xz org.eclipse.jetty.project-599ab9bb1bee454f190d964b67859e46a1e57f87.zip |
460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
Diffstat (limited to 'jetty-jmx')
-rw-r--r-- | jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml | 43 | ||||
-rw-r--r-- | jetty-jmx/src/main/config/etc/jetty-jmx.xml | 11 | ||||
-rw-r--r-- | jetty-jmx/src/main/config/modules/jmx-remote.mod | 12 |
3 files changed, 32 insertions, 34 deletions
diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml index 3527d8b375..c71b7a8aa3 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml @@ -2,27 +2,38 @@ <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd"> <Configure id="Server" class="org.eclipse.jetty.server.Server"> + <!-- =========================================================== --> + <!-- Set the java.rmi.server.hostname property in case you've --> + <!-- got a misconfigured /etc/hosts entry or the like. --> + <!-- =========================================================== --> + <!-- + <Call class="java.lang.System" name="setProperty"> + <Arg>java.rmi.server.hostname</Arg> + <Arg>127.0.0.1</Arg> + </Call> + --> + <!-- Add a remote JMX connector. The parameters of the constructor - below specify the JMX service URL, and the object name string for the - connector server bean. The parameters of the JMXServiceURL constructor - specify the protocol that clients will use to connect to the remote JMX - connector (RMI), the hostname of the server (local hostname), port number - (automatically assigned), and the URL path. Note that URL path contains - the RMI registry hostname and port number, that may need to be modified - in order to comply with the firewall requirements. + below specify the JMX service URL, and the object name string for the + connector server bean. The parameters of the JMXServiceURL constructor + specify the protocol that clients will use to connect to the remote JMX + connector (RMI), the hostname of the server (local hostname), port number + (automatically assigned), and the URL path. Note that URL path contains + the RMI registry hostname and port number, that may need to be modified + in order to comply with the firewall requirements. --> <Call name="addBean"> <Arg> <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer"> - <Arg> - <New class="javax.management.remote.JMXServiceURL"> - <Arg type="java.lang.String">rmi</Arg> - <Arg type="java.lang.String" /> - <Arg type="java.lang.Integer"><Property name="jetty.jmxrmiport" default="1099"/></Arg> - <Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg> - </New> - </Arg> - <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg> + <Arg> + <New class="javax.management.remote.JMXServiceURL"> + <Arg type="java.lang.String">rmi</Arg> + <Arg type="java.lang.String"><Property name="jetty.jmxremote.rmihost,jetty.jmxrmihost" default="localhost"/></Arg> + <Arg type="java.lang.Integer"><Property name="jetty.jmxremote.rmiport,jetty.jmxrmiport" default="1099"/></Arg> + <Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxremote.rmihost,jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxremote.rmiport,jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg> + </New> + </Arg> + <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg> </New> </Arg> </Call> diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml index aca96f7c2c..4c67b8bc78 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -4,17 +4,6 @@ <Configure id="Server" class="org.eclipse.jetty.server.Server"> <!-- =========================================================== --> - <!-- Set the java.rmi.server.hostname property in case you've --> - <!-- got a misconfigured /etc/hosts entry or the like. --> - <!-- =========================================================== --> - <!-- - <Call class="java.lang.System" name="setProperty"> - <Arg>java.rmi.server.hostname</Arg> - <Arg>127.0.0.1</Arg> - </Call> - --> - - <!-- =========================================================== --> <!-- Get the platform mbean server --> <!-- =========================================================== --> <Call id="MBeanServer" class="java.lang.management.ManagementFactory" diff --git a/jetty-jmx/src/main/config/modules/jmx-remote.mod b/jetty-jmx/src/main/config/modules/jmx-remote.mod index b6be74afc9..f8a5111d8f 100644 --- a/jetty-jmx/src/main/config/modules/jmx-remote.mod +++ b/jetty-jmx/src/main/config/modules/jmx-remote.mod @@ -9,10 +9,8 @@ jmx etc/jetty-jmx-remote.xml [ini-template] -## JMX Configuration -## Enable for an open port accessible by remote machines -# jetty.jmxrmihost=localhost -# jetty.jmxrmiport=1099 -## Strictly speaking you shouldn't need --exec to use this in most environments. -## If this isn't working, make sure you enable --exec as well -# -Dcom.sun.management.jmxremote +## The host/address to bind RMI to +# jetty.jmxremote.rmihost=localhost + +## The port RMI listens to +# jetty.jmxremote.rmiport=1099 |