Attachment #18716 for bug #40251

View | Details | Raw Unified | Return to bug 40251
Collapse All | Expand All

Lines 31-39 Link Here

(-)jmx.old/AbstractDynamicMBean.java (+17 lines)
31	public abstract class AbstractDynamicMBean implements DynamicMBean,	31	public abstract class AbstractDynamicMBean implements DynamicMBean,
32	MBeanRegistration {	32	MBeanRegistration {
33		33
		34	public static final String DEFAULT_DOMAIN = "log4j";
		35
34	String dClassName;	36	String dClassName;
35	MBeanServer server;	37	MBeanServer server;
36		38
		39	/** Contains domain of the object name to register MBean instance(s). */
		40	protected String domainName = DEFAULT_DOMAIN;
		41
		42	/** Creates new MBean base in domain. Uses {@link #DEFAULT_DOMAIN}. */
		43	public AbstractDynamicMBean() { }
		44
		45	/**
		46	* Creates new MBean base in specified domain.
		47	* @param domainName part of object name, must not be <code>null</code>
		48	*/
		49	public
		50	AbstractDynamicMBean(String domainName) {
		51	this.domainName = domainName;
		52	}
		53
37	/**	54	/**
38	* Enables the to get the values of several attributes of the Dynamic MBean.	55	* Enables the to get the values of several attributes of the Dynamic MBean.
39	*/	56	*/

Lines 63-68 Link Here

(-)jmx.old/AppenderDynamicMBean.java (-2 / +8 lines)
63	private Appender appender;	63	private Appender appender;
64		64
65	public AppenderDynamicMBean(Appender appender) throws IntrospectionException {	65	public AppenderDynamicMBean(Appender appender) throws IntrospectionException {
		66	this(appender, DEFAULT_DOMAIN);
		67	}
		68
		69	public AppenderDynamicMBean(Appender appender, String domainName)
		70	throws IntrospectionException {
		71	super(domainName);
66	this.appender = appender;	72	this.appender = appender;
67	buildDynamicMBeanInfo();	73	buildDynamicMBeanInfo();
68	}	74	}
Lines 191-197 Link Here
191	ObjectName objectName = null;	197	ObjectName objectName = null;
192	try {	198	try {
193	LayoutDynamicMBean appenderMBean = new LayoutDynamicMBean(layout);	199	LayoutDynamicMBean appenderMBean = new LayoutDynamicMBean(layout);
194	objectName = new ObjectName("log4j:appender="+name);	200	objectName = new ObjectName(domainName+":appender="+name);
195	server.registerMBean(appenderMBean, objectName);	201	server.registerMBean(appenderMBean, objectName);
196		202
197	dAttributes.add(new MBeanAttributeInfo("appender="+name,	203	dAttributes.add(new MBeanAttributeInfo("appender="+name,
Lines 227-233 Link Here
227	cat.debug("getAttribute called with ["+attributeName+"].");	233	cat.debug("getAttribute called with ["+attributeName+"].");
228	if(attributeName.startsWith("appender="+appender.getName()+",layout")) {	234	if(attributeName.startsWith("appender="+appender.getName()+",layout")) {
229	try {	235	try {
230	return new ObjectName("log4j:"+attributeName );	236	return new ObjectName(domainName+":"+attributeName );
231	} catch(Exception e) {	237	} catch(Exception e) {
232	cat.error("attributeName", e);	238	cat.error("attributeName", e);
233	}	239	}

Lines 70-76 Link Here

(-)jmx.old/HierarchyDynamicMBean.java (-3 / +11 lines)
70		70
71	private static Logger log = Logger.getLogger(HierarchyDynamicMBean.class);	71	private static Logger log = Logger.getLogger(HierarchyDynamicMBean.class);
72		72
		73	/** Creates new hierarchy root MBean in default domain. */
73	public HierarchyDynamicMBean() {	74	public HierarchyDynamicMBean() {
		75	this(DEFAULT_DOMAIN);
		76	}
		77
		78	/** Creates new hierarchy root MBean in named domain. */
		79	public HierarchyDynamicMBean(String domainName) {
		80	super(domainName);
74	hierarchy = LogManager.getLoggerRepository();	81	hierarchy = LogManager.getLoggerRepository();
75	buildDynamicMBeanInfo();	82	buildDynamicMBeanInfo();
76	}	83	}
Lines 115-122 Link Here
115	String name = logger.getName();	122	String name = logger.getName();
116	ObjectName objectName = null;	123	ObjectName objectName = null;
117	try {	124	try {
118	LoggerDynamicMBean loggerMBean = new LoggerDynamicMBean(logger);	125	LoggerDynamicMBean loggerMBean = new LoggerDynamicMBean(logger,
119	objectName = new ObjectName("log4j", "logger", name);	126	domainName);
		127	objectName = new ObjectName(domainName, "logger", name);
120	server.registerMBean(loggerMBean, objectName);	128	server.registerMBean(loggerMBean, objectName);
121		129
122	NotificationFilterSupport nfs = new NotificationFilterSupport();	130	NotificationFilterSupport nfs = new NotificationFilterSupport();
Lines 221-227 Link Here
221	val = attributeName.substring(0, k)+'='+ attributeName.substring(k+3);	229	val = attributeName.substring(0, k)+'='+ attributeName.substring(k+3);
222	}	230	}
223	try {	231	try {
224	return new ObjectName("log4j:"+val);	232	return new ObjectName(domainName+":"+val);
225	} catch(Exception e) {	233	} catch(Exception e) {
226	log.error("Could not create ObjectName" + val);	234	log.error("Could not create ObjectName" + val);
227	}	235	}

Lines 61-66 Link Here

(-)jmx.old/LoggerDynamicMBean.java (-3 / +9 lines)
61	private Logger logger;	61	private Logger logger;
62		62
63	public LoggerDynamicMBean(Logger logger) {	63	public LoggerDynamicMBean(Logger logger) {
		64	this(logger, DEFAULT_DOMAIN);
		65	}
		66
		67	public LoggerDynamicMBean(Logger logger, String domainName) {
		68	super(domainName);
64	this.logger = logger;	69	this.logger = logger;
65	buildDynamicMBeanInfo();	70	buildDynamicMBeanInfo();
66	}	71	}
Lines 172-178 Link Here
172	}	177	}
173	} else if(attributeName.startsWith("appender=")) {	178	} else if(attributeName.startsWith("appender=")) {
174	try {	179	try {
175	return new ObjectName("log4j:"+attributeName );	180	return new ObjectName(domainName+":"+attributeName );
176	} catch(Exception e) {	181	} catch(Exception e) {
177	cat.error("Could not create ObjectName" + attributeName);	182	cat.error("Could not create ObjectName" + attributeName);
178	}	183	}
Lines 255-262 Link Here
255	cat.debug("Adding AppenderMBean for appender named "+name);	260	cat.debug("Adding AppenderMBean for appender named "+name);
256	ObjectName objectName = null;	261	ObjectName objectName = null;
257	try {	262	try {
258	AppenderDynamicMBean appenderMBean = new AppenderDynamicMBean(appender);	263	AppenderDynamicMBean appenderMBean = new AppenderDynamicMBean(appender,
259	objectName = new ObjectName("log4j", "appender", name);	264	domainName);
		265	objectName = new ObjectName(domainName, "appender", name);
260	server.registerMBean(appenderMBean, objectName);	266	server.registerMBean(appenderMBean, objectName);
261		267
262	dAttributes.add(new MBeanAttributeInfo("appender="+name,	268	dAttributes.add(new MBeanAttributeInfo("appender="+name,

Return to bug 40251