luehe       2004/03/19 17:35:02

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapper.java
  Log:
  Changed oname format of JSP monitoring mbean. The new format is:
  
  
<domain>:type=JspMonitor,WebModule=<webmod>,J2EEApplication=<j2ee-app>,J2EEServer=<j2ee-server>
  
  Revision  Changes    Path
  1.40      +5 -6      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- StandardWrapper.java      9 Mar 2004 18:51:29 -0000       1.39
  +++ StandardWrapper.java      20 Mar 2004 01:35:02 -0000      1.40
  @@ -1607,7 +1607,6 @@
                             ",WebModule=" + webMod + ",J2EEApplication=" +
                             ctx.getJ2EEApplication() + ",J2EEServer=" +
                             ctx.getJ2EEServer();
  -
           try {
               oname=new ObjectName(onameStr);
               controller=oname;
  @@ -1628,11 +1627,11 @@
   
           if (isJspServlet) {
               // Register JSP monitoring mbean
  +            onameStr = domain + ":type=JspMonitor,WebModule=" + webMod +
  +                       ",J2EEApplication=" + ctx.getJ2EEApplication() +
  +                       ",J2EEServer=" + ctx.getJ2EEServer();
               try {
  -                jspMonitorON = new ObjectName(domain +
  -                                              ":type=JspMonitor,path=" +
  -                                              parentName + ",host=" +
  -                                              hostName);
  +                jspMonitorON = new ObjectName(onameStr);
                   Registry.getRegistry(null, null)
                       .registerComponent(instance, jspMonitorON, null);
               } catch( Exception ex ) {
  
  
  

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

Reply via email to