Skip to content
Snippets Groups Projects
Commit cf7bf7fe authored by Vincent Massol's avatar Vincent Massol
Browse files

XWIKI-11377: Add ability to monitor/manage the Jetty instance through JMX

* Removed unnecessary -Dcom.sun.management.jmxremote system property (was needed only on JDK 1.7.0_25 which apparently has a bug on Mac)
parent b159a458
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ usage() { ...@@ -37,7 +37,7 @@ usage() {
echo "-sp, --stopport: The Jetty stop port to use. Overrides any value from JETTY_STOP_PORT. Defaults to 8079." echo "-sp, --stopport: The Jetty stop port to use. Overrides any value from JETTY_STOP_PORT. Defaults to 8079."
echo "-ld, --lockdir: The directory where the executing process id is stored to verify that that only one instance" echo "-ld, --lockdir: The directory where the executing process id is stored to verify that that only one instance"
echo " is started. Defaults to /var/tmp." echo " is started. Defaults to /var/tmp."
echo "-j, --jmx: Allows monitoring the Jetty server with a JMX console (such as jconsole)." echo "-j, --jmx: Allows monitoring/managing Jetty through JMX."
echo "" echo ""
echo "Example: start_xwiki.sh -p 8080 -sp 8079" echo "Example: start_xwiki.sh -p 8080 -sp 8079"
} }
...@@ -96,7 +96,6 @@ while [[ $# > 0 ]]; do ...@@ -96,7 +96,6 @@ while [[ $# > 0 ]]; do
shift shift
;; ;;
-j|--jmx) -j|--jmx)
XWIKI_OPTS="$XWIKI_OPTS -Dcom.sun.management.jmxremote"
JETTY_OPTS="$JETTY_OPTS --module=jmx" JETTY_OPTS="$JETTY_OPTS --module=jmx"
;; ;;
-h|--help) -h|--help)
......
...@@ -36,7 +36,7 @@ usage() { ...@@ -36,7 +36,7 @@ usage() {
echo "-sp, --stopport: The Jetty stop port to use. Overrides any value from JETTY_STOP_PORT. Defaults to 8079." echo "-sp, --stopport: The Jetty stop port to use. Overrides any value from JETTY_STOP_PORT. Defaults to 8079."
echo "-ld, --lockdir: The directory where the executing process id is stored to verify that that only one instance" echo "-ld, --lockdir: The directory where the executing process id is stored to verify that that only one instance"
echo " is started. Defaults to /var/tmp." echo " is started. Defaults to /var/tmp."
echo "-j, --jmx: Allows monitoring the Jetty server with a JMX console (such as jconsole)." echo "-j, --jmx: Allows monitoring/managing Jetty through JMX."
echo "-yp, --yourkitpath: The path where Yourkit can find the agent. If not passed then YourKit won't be enabled." echo "-yp, --yourkitpath: The path where Yourkit can find the agent. If not passed then YourKit won't be enabled."
echo " For example: \"/Applications/YourKit Java Profiler 7.0.11.app/bin/mac\"" echo " For example: \"/Applications/YourKit Java Profiler 7.0.11.app/bin/mac\""
echo " or \"/home/User/yjp-11.0.8/bin/linux-x86-64/\"" echo " or \"/home/User/yjp-11.0.8/bin/linux-x86-64/\""
...@@ -100,7 +100,6 @@ while [[ $# > 0 ]]; do ...@@ -100,7 +100,6 @@ while [[ $# > 0 ]]; do
shift shift
;; ;;
-j|--jmx) -j|--jmx)
XWIKI_OPTS="$XWIKI_OPTS -Dcom.sun.management.jmxremote"
JETTY_OPTS="$JETTY_OPTS --module=jmx" JETTY_OPTS="$JETTY_OPTS --module=jmx"
;; ;;
-yp|--yourkitpath) -yp|--yourkitpath)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment