[jboss-cvs] JBossAS SVN: r87758 - in projects/jboss-man/branches/Branch_2_1: metatype/src/main/java/org/jboss/metatype/plugins/values and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Apr 24 00:56:18 EDT 2009
Author: scott.stark at jboss.org
Date: 2009-04-24 00:56:18 -0400 (Fri, 24 Apr 2009)
New Revision: 87758
Modified:
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/OperatingSystemMXBeanMO.java
projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ThreadMXBeanMO.java
projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java
Log:
JBMAN-78, Update ObjectName ctor usage to work with jdk6
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/OperatingSystemMXBeanMO.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/OperatingSystemMXBeanMO.java 2009-04-24 04:46:39 UTC (rev 87757)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/OperatingSystemMXBeanMO.java 2009-04-24 04:56:18 UTC (rev 87758)
@@ -65,4 +65,9 @@
return null;
}
+ @ManagementProperty(description="the system load average.")
+ public double getSystemLoadAverage()
+ {
+ return 0;
+ }
}
Modified: projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ThreadMXBeanMO.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ThreadMXBeanMO.java 2009-04-24 04:46:39 UTC (rev 87757)
+++ projects/jboss-man/branches/Branch_2_1/managed/src/main/java/org/jboss/managed/plugins/jmx/ThreadMXBeanMO.java 2009-04-24 04:56:18 UTC (rev 87758)
@@ -43,7 +43,6 @@
targetInterface=ThreadMXBean.class)
public class ThreadMXBeanMO implements ThreadMXBean
{
-
@ManagementOperation(description="an array of IDs of the threads that are monitor deadlocked, if any; null otherwise.")
public long[] findMonitorDeadlockedThreads()
{
@@ -183,4 +182,33 @@
{
}
+ @ManagementOperation(description="an array of IDs of the threads that are deadlocked, if any; null otherwise.")
+ public long[] findDeadlockedThreads()
+ {
+ return null;
+ }
+
+ @ManagementProperty(description="true if the object monitor usage is supported; false</tt> otherwise.")
+ public boolean isObjectMonitorUsageSupported()
+ {
+ return false;
+ }
+
+ @ManagementProperty(description="true if the synchronizer usage is supported; false</tt> otherwise.")
+ public boolean isSynchronizerUsageSupported()
+ {
+ return false;
+ }
+
+ @ManagementOperation(description="TODO - description")
+ public ThreadInfo[] getThreadInfo(long[] ids, boolean lockedMonitors, boolean lockedSynchronizers)
+ {
+ return null;
+ }
+
+ @ManagementOperation(description="TODO - description")
+ public ThreadInfo[] dumpAllThreads(boolean lockedMonitors, boolean lockedSynchronizers)
+ {
+ return null;
+ }
}
Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2009-04-24 04:46:39 UTC (rev 87757)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2009-04-24 04:56:18 UTC (rev 87758)
@@ -36,14 +36,12 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import java.util.Set;
import java.util.SortedSet;
import java.util.Stack;
import java.util.WeakHashMap;
import java.util.Map.Entry;
-import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import org.jboss.beans.info.spi.BeanInfo;
@@ -81,6 +79,7 @@
import org.jboss.metatype.api.values.TableValue;
import org.jboss.metatype.api.values.TableValueSupport;
import org.jboss.metatype.plugins.types.DefaultMetaTypeFactory;
+import org.jboss.metatype.plugins.values.mappers.PropertiesObjectNameMetaMapper;
import org.jboss.metatype.spi.values.MetaMapper;
import org.jboss.metatype.spi.values.MetaValueBuilder;
import org.jboss.reflect.plugins.introspection.ParameterizedClassInfo;
@@ -745,7 +744,7 @@
ObjectName name;
try
{
- name = new ObjectName(domainUnwrap, propsValue);
+ name = PropertiesObjectNameMetaMapper.createObjectName(domainUnwrap, propsValue);
}
catch (Exception e)
{
Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java 2009-04-24 04:46:39 UTC (rev 87757)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/values/mappers/PropertiesObjectNameMetaMapper.java 2009-04-24 04:56:18 UTC (rev 87758)
@@ -25,8 +25,11 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Hashtable;
+import java.util.Enumeration;
import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
import org.jboss.metatype.api.types.MetaType;
import org.jboss.metatype.api.types.PropertiesMetaType;
@@ -35,8 +38,10 @@
import org.jboss.metatype.spi.values.MetaMapper;
/**
- * An ObjectName MetaMapper that maps to a PropertiesMetaType/PropertiesMetaValue
+ * An ObjectName MetaMapper that maps to a PropertiesMetaType/PropertiesMetaValue.
+ *
* @author Scott.Stark at jboss.org
+ * @author Ales.Justin at jboss.org
* @version $Revision$
*/
public class PropertiesObjectNameMetaMapper extends MetaMapper<ObjectName>
@@ -94,11 +99,9 @@
{
PropertiesMetaValue map = (PropertiesMetaValue) metaValue;
String domain = (String) map.remove("domain");
-
try
{
- ObjectName name = new ObjectName(domain, map);
- return name;
+ return createObjectName(domain, map);
}
catch(Exception e)
{
@@ -106,4 +109,32 @@
}
}
+ /**
+ * Create object name from PropertiesMetaValue.
+ * Make it JDK 1.6 compatible.
+ *
+ * @param domain the domain name
+ * @param props the props
+ * @return new ObjectName instance
+ * @throws javax.management.MalformedObjectNameException for any error
+ */
+ public static ObjectName createObjectName(String domain, PropertiesMetaValue props) throws MalformedObjectNameException
+ {
+ if (props == null)
+ return new ObjectName(domain);
+
+ Hashtable<String, String> table = new Hashtable<String, String>();
+ Enumeration<?> enumeration = props.propertyNames();
+ while (enumeration.hasMoreElements())
+ {
+ Object key = enumeration.nextElement();
+ if (key instanceof String)
+ {
+ String stringKey = (String)key;
+ String property = props.getProperty(stringKey);
+ table.put(stringKey, property);
+ }
+ }
+ return new ObjectName(domain, table);
+ }
}
More information about the jboss-cvs-commits
mailing list