From: funkman <funkman@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 20 Jun 2006 11:12:30 +0000 (+0000)
Subject: Remove JMX warning message since java5 is required
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1d0ba9f2892a2989f259c1fa74ca7de6ef964737;p=tomcat7.0

Remove JMX warning message since java5 is required



git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@415610 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/startup/Bootstrap.java b/java/org/apache/catalina/startup/Bootstrap.java
index fa7f817bf..09f658bf9 100644
--- a/java/org/apache/catalina/startup/Bootstrap.java
+++ b/java/org/apache/catalina/startup/Bootstrap.java
@@ -62,13 +62,6 @@ public final class Bootstrap {
     // ------------------------------------------------------- Static Variables
 
 
-    private static final String JMX_ERROR_MESSAGE =
-        "This release of Apache Tomcat was packaged to run on J2SE 5.0 \n"
-        + "or later. It can be run on earlier JVMs by downloading and \n"
-        + "installing a compatibility package from the Apache Tomcat \n"
-        + "binary download page.";
-
-
     /**
      * Daemon object used by main.
      */
@@ -390,19 +383,6 @@ public final class Bootstrap {
      */
     public static void main(String args[]) {
 
-        try {
-            // Attempt to load JMX class
-            new ObjectName("test:foo=bar");
-        } catch (Throwable t) {
-            System.out.println(JMX_ERROR_MESSAGE);
-            try {
-                // Give users some time to read the message before exiting
-                Thread.sleep(5000);
-            } catch (Exception ex) {
-            }
-            return;
-        }
-
         if (daemon == null) {
             daemon = new Bootstrap();
             try {