svn commit: r948232 - in /tomcat/trunk/java/org/apache/catalina/core: StandardContext.java StandardServer.java

[markt]

Author: markt
Date: Tue May 25 22:43:45 2010
New Revision: 948232

URL: http://svn.apache.org/viewvc?rev=948232&view=rev
Log:
Restore the naming resource MBeans

Modified:
    tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
    tomcat/trunk/java/org/apache/catalina/core/StandardServer.java

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=948232&r1=948231&r2=948232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue May 25 
22:43:45 2010
@@ -418,7 +418,7 @@ public class StandardContext extends Con
      * The naming resources for this web application.
      */
     private NamingResources namingResources = null;
-
+    private ObjectName onameNamingResoucres;
 
     /**
      * The message destinations for this web application.
@@ -1745,7 +1745,10 @@ public class StandardContext extends Con
         namingResources.setContainer(this);
         support.firePropertyChange("namingResources",
                                    oldNamingResources, this.namingResources);
-
+        
+        unregister(onameNamingResoucres);
+        onameNamingResoucres = register(namingResources,
+                "type=NamingResources," + getObjectNameKeyProperties());
     }
 
 
@@ -4992,6 +4995,8 @@ public class StandardContext extends Con
                             sequenceNumber++);
         broadcaster.sendNotification(notification);
 
+        unregister(onameNamingResoucres);
+
         synchronized (instanceListenersLock) {
             instanceListeners = new String[0];
         }
@@ -5542,6 +5547,12 @@ public class StandardContext extends Con
             this.addLifecycleListener(new TldConfig());
         }
 
+        // Register the naming resources
+        if (namingResources != null) {
+            onameNamingResoucres = register(namingResources,
+                    "type=NamingResources," + getObjectNameKeyProperties());
+        }
+
         // Send j2ee.object.created notification 
         if (this.getObjectName() != null) {
             Notification notification = new Notification(

Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=948232&r1=948231&r2=948232&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Tue May 25 
22:43:45 2010
@@ -692,6 +692,10 @@ public final class StandardServer extend
         // Register the MBeanFactory
         onameMBeanFactory = register(new MBeanFactory(), "type=MBeanFactory");
         
+        // Register the naming resources
+        onameNamingResoucres = register(globalNamingResources,
+                "type=NamingResources");
+        
         // Initialize our defined Services
         for (int i = 0; i < services.length; i++) {
             services[i].init();
@@ -709,11 +713,14 @@ public final class StandardServer extend
         
         unregister(onameStringCache);
         
+        unregister(onameNamingResoucres);
+        
         super.destroyInternal();
     }
 
     private ObjectName onameStringCache;
     private ObjectName onameMBeanFactory;
+    private ObjectName onameNamingResoucres;
     
     /**
      * Obtain the MBean domain for this server. The domain is obtained using



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