(jspwiki) branch master updated: Make MBeans

[juanpablo]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new b3847dcb9 Make MBeans
b3847dcb9 is described below

commit b3847dcb9cd7a701d86857b8b771ae658c52de26
Author: udittmer <34645700+uditt...@users.noreply.github.com>
AuthorDate: Wed Jul 31 15:50:14 2024 +0200

    Make MBeans
    
    This fix includes the jspwiki.applicationName in the name of MBeans. This 
ensures MBeans are kept separate in case more than one JSPWiki instance runs in 
a JVM.
---
 .../main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
 
b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
index fac49b109..3afb19048 100644
--- 
a/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
+++ 
b/jspwiki-main/src/main/java/org/apache/wiki/ui/admin/DefaultAdminBeanManager.java
@@ -57,6 +57,7 @@ import java.util.List;
 public class DefaultAdminBeanManager implements WikiEventListener, 
AdminBeanManager {
 
     private final Engine m_engine;
+    private final String applicationName;
     private ArrayList< AdminBean > m_allBeans;
     private final MBeanServer m_mbeanServer;
 
@@ -67,6 +68,7 @@ public class DefaultAdminBeanManager implements 
WikiEventListener, AdminBeanMana
         m_mbeanServer = MBeanServerFactory15.getServer();
 
         m_engine = engine;
+        applicationName = 
m_engine.getWikiProperties().getProperty("jspwiki.applicationName").trim();
 
         if( m_mbeanServer != null ) {
             LOG.info( m_mbeanServer.getClass().getName() );
@@ -131,7 +133,7 @@ public class DefaultAdminBeanManager implements 
WikiEventListener, AdminBeanMana
     private ObjectName getObjectName( final AdminBean ab ) throws 
MalformedObjectNameException {
         final String component = getJMXTitleString( ab.getType() );
         final String title     = ab.getTitle();
-        return new ObjectName( Release.APPNAME + ":component=" + component + 
",name=" + title );
+        return new ObjectName(String.format("%s:component=%s,name=%s (%s)", 
Release.APPNAME, component, title, applicationName));
     }
 
     /**