diff options
| author | Jan Bartel | 2012-03-30 01:05:46 +0000 |
|---|---|---|
| committer | Jan Bartel | 2012-03-30 01:05:46 +0000 |
| commit | 17269583fbd6e3ef8041a544818384d04c088219 (patch) | |
| tree | 31a26ed9b4287f3e84ca05483123d442b366899f /jetty-jmx | |
| parent | 0f9a898c1c563ede10a5c2cf05bcb27ec3795658 (diff) | |
| parent | ec5f424c8c190c412ca122850b914f89e53148e9 (diff) | |
| download | org.eclipse.jetty.project-17269583fbd6e3ef8041a544818384d04c088219.tar.gz org.eclipse.jetty.project-17269583fbd6e3ef8041a544818384d04c088219.tar.xz org.eclipse.jetty.project-17269583fbd6e3ef8041a544818384d04c088219.zip | |
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-jmx')
| -rw-r--r-- | jetty-jmx/src/main/config/etc/jetty-jmx.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jetty-jmx/src/main/config/etc/jetty-jmx.xml b/jetty-jmx/src/main/config/etc/jetty-jmx.xml index a685eded05..4db0dbb473 100644 --- a/jetty-jmx/src/main/config/etc/jetty-jmx.xml +++ b/jetty-jmx/src/main/config/etc/jetty-jmx.xml @@ -69,7 +69,7 @@ --> <!-- <Call name="createRegistry" class="java.rmi.registry.LocateRegistry"> - <Arg type="java.lang.Integer">1099</Arg> + <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1099"/></Arg> <Call name="sleep" class="java.lang.Thread"> <Arg type="java.lang.Integer">1000</Arg> </Call> @@ -91,11 +91,11 @@ <New class="javax.management.remote.JMXServiceURL"> <Arg type="java.lang.String">rmi</Arg> <Arg type="java.lang.String" /> - <Arg type="java.lang.Integer">0</Arg> - <Arg type="java.lang.String">/jndi/rmi://localhost:1099/jettyjmx</Arg> + <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> </Arg> - <Arg>org.eclipse.jetty:name=rmiconnectorserver</Arg> + <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg> <Call name="start" /> </New> --> |