remm        2004/03/12 06:32:47

  Modified:    catalina/src/share/org/apache/catalina/startup
                        Bootstrap.java
  Log:
  - Add error message about the absence of JMX when running standalone.
  - This is not i18nized because it will most likely go to the console, and few classes
    are available at the start of bootstrap.
  
  Revision  Changes    Path
  1.18      +24 -1     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
  
  Index: Bootstrap.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Bootstrap.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Bootstrap.java    2 Mar 2004 12:32:08 -0000       1.17
  +++ Bootstrap.java    12 Mar 2004 14:32:47 -0000      1.18
  @@ -59,6 +59,16 @@
       // ------------------------------------------------------- Static Variables
   
   
  +    private static final String JMX_ERROR_MESSAGE =
  +        "Due to new licensing guidelines mandated by the Apache Software\n"
  +        + "Foundation Board of Directors, a JMX implementation can no longer\n"
  +        + "be distributed with the Apache Tomcat binaries. As a result, you \n"
  +        + "must download a JMX 1.2 implementation (such as the Sun Reference\n"
  +        + "Implementation) and copy the JAR containing the API and \n"
  +        + "implementation of the JMX specification to: \n" 
  +        + "${catalina.home}/bin/jmx.jar";
  +
  +
       /**
        * Daemon object used by main.
        */
  @@ -369,6 +379,19 @@
        * @param args Command line arguments to be processed
        */
       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();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to