From e3d380bb7d09b978ba0b57362ec9893c4cc252ff Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Thu, 12 Mar 2015 13:41:18 +1100
Subject: [PATCH] 461941 JMX Remote host:port set from start properties

---
 .../eclipse/jetty/embedded/ServerWithJMX.java | 56 +++++++++++++++++++
 .../src/main/config/etc/jetty-jmx-remote.xml  | 22 ++++----
 2 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJMX.java

diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJMX.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJMX.java
new file mode 100644
index 00000000000..79d2a5fe281
--- /dev/null
+++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJMX.java
@@ -0,0 +1,56 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
+//  ------------------------------------------------------------------------
+//  All rights reserved. This program and the accompanying materials
+//  are made available under the terms of the Eclipse Public License v1.0
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.embedded;
+
+import java.lang.management.ManagementFactory;
+
+import javax.management.remote.JMXServiceURL;
+
+import org.eclipse.jetty.jmx.ConnectorServer;
+import org.eclipse.jetty.jmx.MBeanContainer;
+import org.eclipse.jetty.server.Server;
+
+/**
+ * The simplest possible Jetty server.
+ */
+public class ServerWithJMX
+{
+    public static void main( String[] args ) throws Exception
+    {
+        // === jetty-jmx.xml ===
+        MBeanContainer mbContainer = new MBeanContainer(
+                ManagementFactory.getPlatformMBeanServer());
+        
+        Server server = new Server(8080);
+        server.addBean(mbContainer);
+        
+        ConnectorServer jmx = new ConnectorServer(
+                new JMXServiceURL(
+                        "rmi",
+                        null,
+                        1999,
+                        "/jndi/rmi://localhost:1999/jmxrmi"),
+                        "org.eclipse.jetty.jmx:name=rmiconnectorserver");
+        server.addBean(jmx);
+        
+        server.start();
+        server.dumpStdErr();
+        server.join();
+    }
+}
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 20a2dda2399..3527d8b375c 100644
--- a/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml
+++ b/jetty-jmx/src/main/config/etc/jetty-jmx-remote.xml
@@ -11,17 +11,19 @@
        the RMI registry hostname and port number, that may need to be modified
        in order to comply with the firewall requirements.
   -->
-  <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
+  <Call name="addBean">
     <Arg>
-      <New class="javax.management.remote.JMXServiceURL">
-        <Arg type="java.lang.String">rmi</Arg>
-        <Arg type="java.lang.String" />
-        <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg>
-        <Arg type="java.lang.String">/jndi/rmi://<SystemProperty name="jetty.jmxrmihost" default="localhost"/>:<SystemProperty name="jetty.jmxrmiport" default="1099"/>/jmxrmi</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>
       </New>
     </Arg>
-    <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
-    <Call name="start" />
-  </New>
+  </Call>
 </Configure>
-