svn commit: r730426 - /incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java

[ajaquith]

Author: ajaquith
Date: Wed Dec 31 09:38:25 2008
New Revision: 730426

URL: http://svn.apache.org/viewvc?rev=730426&view=rev
Log:
JMX beans now register themselves using the wiki name as part of the MBean 
name, which means more than 1 webapp can co-exist.

Modified:
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java

Modified: 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java?rev=730426&r1=730425&r2=730426&view=diff
==============================================================================
--- 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java 
(original)
+++ 
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/admin/AdminBeanManager.java 
Wed Dec 31 09:38:25 2008
@@ -115,6 +115,12 @@
                     m_mbeanServer.registerMBean( ab, name );
                     log.info("Registered new admin bean "+ab.getTitle());
                 }
+                else
+                {
+                    throw new RuntimeException( "JMX bean named " + name +
+                                                " is already registered. Hint: 
are you running 2 webapps with the same " +
+                                                WikiEngine.PROP_APPNAME + "?" 
);
+                }
             }
 
             m_allBeans.add( ab );
@@ -147,7 +153,7 @@
         String component = getJMXTitleString( ab.getType() );
         String title     = ab.getTitle();
 
-        ObjectName name = new ObjectName( Release.APPNAME + 
":component="+component+",name="+title );
+        ObjectName name = new ObjectName( Release.APPNAME + ":wiki=" + 
m_engine.getApplicationName() + ",component="+component+",name="+title );
         return name;
     }