Update of /var/cvs/src/org/mmbase/cache
In directory james.mmbase.org:/tmp/cvs-serv25028
Modified Files:
CacheManager.java
Log Message:
rationalized the ObjectName's a bit, which results a more convenient, and more
logical user interaction in jconsole
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/cache
Index: CacheManager.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/cache/CacheManager.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- CacheManager.java 14 Nov 2008 16:21:47 -0000 1.43
+++ CacheManager.java 15 Nov 2008 19:15:10 -0000 1.44
@@ -32,7 +32,7 @@
* static any more.
*
* @since MMBase-1.8
- * @version $Id: CacheManager.java,v 1.43 2008/11/14 16:21:47 michiel Exp $
+ * @version $Id: CacheManager.java,v 1.44 2008/11/15 19:15:10 michiel Exp $
*/
public class CacheManager implements CacheManagerMBean {
@@ -66,12 +66,12 @@
try {
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().assertUp();
- props.put("type", "CacheManagerMBean");
+ props.put("type", "Caches");
String machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
if (machineName != null) {
- props.put("mmb", machineName);
+ props.put("type", machineName);
}
- on = new ObjectName("org.mmbase.cache", props);
+ on = new ObjectName("org.mmbase", props);
} catch (MalformedObjectNameException mfone) {
log.warn("" + props + " " + mfone);
return;
@@ -190,7 +190,7 @@
private static ObjectName getObjectName(Cache cache) {
Hashtable<String, String> props = new Hashtable<String, String>();
try {
- props.put("type", "CacheMBean");
+ props.put("type", "Caches");
org.mmbase.util.transformers.CharTransformer identifier = new
org.mmbase.util.transformers.Identifier();
String machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
if (machineName != null) {
@@ -202,7 +202,7 @@
} else {
//props.put("name", "*"); // WTF, this does not work in java 5.
}
- return new ObjectName("org.mmbase.cache", props);
+ return new ObjectName("org.mmbase", props);
} catch (MalformedObjectNameException mfone) {
log.warn("" + props + " " + mfone);
return null;
@@ -368,13 +368,13 @@
}
{
final Hashtable<String, String> props = new Hashtable<String,
String>();
- props.put("type", "CacheManagerMBean");
+ props.put("type", "Caches");
String machineName =
org.mmbase.module.core.MMBaseContext.getMachineName();
if (machineName != null) {
- props.put("mmb", machineName);
+ props.put("type", machineName);
}
try {
- ObjectName name = new ObjectName("org.mmbase.cache", props);
+ ObjectName name = new ObjectName("org.mmbase", props);
if (mbs.isRegistered(name)) {
mbs.unregisterMBean(name);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
