[jboss-cvs] JBossAS SVN: r87718 - in projects/jboss-man/trunk: metatype/src/main/java/org/jboss/metatype/plugins/values and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 23 07:20:53 EDT 2009
Author: alesj
Date: 2009-04-23 07:20:53 -0400 (Thu, 23 Apr 2009)
New Revision: 87718
Modified:
projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
projects/jboss-man/trunk/pom.xml
Log:
Update libs, fix ON ctor usage
Modified: projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java
===================================================================
--- projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2009-04-23 09:30:56 UTC (rev 87717)
+++ projects/jboss-man/trunk/metatype/src/main/java/org/jboss/metatype/plugins/values/DefaultMetaValueFactory.java 2009-04-23 11:20:53 UTC (rev 87718)
@@ -36,15 +36,14 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedSet;
import java.util.Stack;
import java.util.WeakHashMap;
-import java.util.Map.Entry;
-
+import java.util.Enumeration;
+import javax.management.ObjectName;
import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
import org.jboss.beans.info.spi.BeanInfo;
import org.jboss.beans.info.spi.PropertyInfo;
@@ -735,6 +734,35 @@
return newElement;
}
+ /**
+ * Create object name from PropertiesMetaValue.
+ * Make it JDK 1.6 compatible.
+ *
+ * @param domainUnwrap the domain name
+ * @param props the props
+ * @return new ObjectName instance
+ * @throws MalformedObjectNameException for any error
+ */
+ protected ObjectName createObjectName(String domainUnwrap, PropertiesMetaValue props) throws MalformedObjectNameException
+ {
+ if (props == null)
+ return new ObjectName(domainUnwrap);
+
+ 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(domainUnwrap, table);
+ }
+
protected Object unwrapProperties(PropertiesMetaValue propsValue, TypeInfo type)
{
Class<?> clazz = type.getType();
@@ -745,7 +773,7 @@
ObjectName name;
try
{
- name = new ObjectName(domainUnwrap, propsValue);
+ name = createObjectName(domainUnwrap, propsValue);
}
catch (Exception e)
{
@@ -796,11 +824,11 @@
MetaValue domain = compositeValue.get("domain");
String domainUnwrap = (String) unwrap(domain, String.class);
MetaValue keys = compositeValue.get("keyPropertyList");
- Hashtable keysUnwrap = null;
+ PropertiesMetaValue keysUnwrap = null;
if(keys instanceof PropertiesMetaValue)
keysUnwrap = (PropertiesMetaValue) keys;
- ObjectName name = new ObjectName(domainUnwrap, keysUnwrap);
- return name;
+
+ return createObjectName(domainUnwrap, keysUnwrap);
}
Object bean = createNewInstance(beanInfo);
Modified: projects/jboss-man/trunk/pom.xml
===================================================================
--- projects/jboss-man/trunk/pom.xml 2009-04-23 09:30:56 UTC (rev 87717)
+++ projects/jboss-man/trunk/pom.xml 2009-04-23 11:20:53 UTC (rev 87718)
@@ -19,15 +19,15 @@
</scm>
<properties>
- <version.jboss.common.core>2.2.9.GA</version.jboss.common.core>
+ <version.jboss.common.core>2.2.12.GA</version.jboss.common.core>
<version.jboss.common.logging.spi>2.0.5.GA</version.jboss.common.logging.spi>
<version.jboss.common.logging.log4j>2.0.5.GA</version.jboss.common.logging.log4j>
- <version.org.jboss.reflect>2.0.1.GA</version.org.jboss.reflect>
+ <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>
<version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
<version.junit>4.4</version.junit>
<version.sun.jaxb>2.1.4</version.sun.jaxb>
- <version.javassist>3.9.0.GA</version.javassist>
+ <version.javassist>3.10.0.GA</version.javassist>
</properties>
<modules>
More information about the jboss-cvs-commits
mailing list