[tomcat] branch master updated: Add --no-jmx flag

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 21ca769  Add --no-jmx flag
21ca769 is described below

commit 21ca76939204b9b18a5b0e5f25f01b2b797536ab
Author: remm <r...@apache.org>
AuthorDate: Tue Apr 30 13:59:00 2019 +0200

    Add --no-jmx flag
    
    It is possible I find it useful when I am able to resume my experiments
    with Graal.
---
 java/org/apache/catalina/startup/Tomcat.java | 3 +++
 webapps/docs/changelog.xml                   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/java/org/apache/catalina/startup/Tomcat.java 
b/java/org/apache/catalina/startup/Tomcat.java
index cb4d3e1..2309109 100644
--- a/java/org/apache/catalina/startup/Tomcat.java
+++ b/java/org/apache/catalina/startup/Tomcat.java
@@ -74,6 +74,7 @@ import org.apache.tomcat.util.buf.UriUtil;
 import org.apache.tomcat.util.descriptor.web.LoginConfig;
 import org.apache.tomcat.util.file.ConfigFileLoader;
 import org.apache.tomcat.util.file.ConfigurationSource;
+import org.apache.tomcat.util.modeler.Registry;
 import org.apache.tomcat.util.res.StringManager;
 
 // TODO: lazy init for the temp dir - only when a JSP is compiled or
@@ -1437,6 +1438,8 @@ public class Tomcat {
                 path = args[i];
             } else if (args[i].equals("--await")) {
                 await = true;
+            } else if (args[i].equals("--no-jmx")) {
+                Registry.disableRegistry();
             } else {
                 throw new 
IllegalArgumentException(sm.getString("tomcat.invalidCommandLine", args[i]));
             }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ee1c505..928d865 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -111,6 +111,10 @@
         credentials trigger account lock out when the <code>LockOutRealm</code>
         is in use. Patch provided by jchobantonov. (markt)
       </fix>
+      <fix>
+        Add <code>--no-jmx</code> flag to allow disabling JMX in
+        <code>startup.Tomcat.main</code>. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org