[jboss-cvs] JBossAS SVN: r95320 - in projects/jboss-man/branches/Branch_2_1: metatype/src/main/java/org/jboss/metatype/plugins/types and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 21 13:56:42 EDT 2009
Author: emuckenhuber
Date: 2009-10-21 13:56:42 -0400 (Wed, 21 Oct 2009)
New Revision: 95320
Modified:
projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
projects/jboss-man/branches/Branch_2_1/pom.xml
Log:
Update Common to 2.2.16.GA, MDR to 2.0.2.GA, Javassist to 3.11.0.GA.
Modified: projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java
===================================================================
--- projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java 2009-10-21 17:52:55 UTC (rev 95319)
+++ projects/jboss-man/branches/Branch_2_1/metatype/src/main/java/org/jboss/metatype/plugins/types/DefaultMetaTypeFactory.java 2009-10-21 17:56:42 UTC (rev 95320)
@@ -26,6 +26,8 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -88,6 +90,9 @@
/** The configuration */
private static Configuration configuration;
+ /** Ignore bean types. */
+ private static final Collection<String> ignoreBeans = new HashSet<String>();
+
static
{
configuration = AccessController.doPrivileged(new PrivilegedAction<Configuration>()
@@ -97,6 +102,11 @@
return new PropertyConfiguration();
}
});
+
+ // FIXME this is a hack
+ ignoreBeans.add("org.jboss.logging.Logger");
+ ignoreBeans.add("java.util.logging.Logger");
+ ignoreBeans.add("org.apache.log4j.Logger");
}
/** The object type info */
@@ -374,41 +384,44 @@
MutableCompositeMetaType result = new MutableCompositeMetaType(typeInfo.getName(), typeInfo.getName());
typeInfo.setAttachment(MetaType.class.getName(), result);
- Set<String> keys = null;
- Set<PropertyInfo> properties = beanInfo.getProperties();
- if (properties != null && properties.size() > 0)
+ if(ignoreBeans.contains(typeInfo.getName()) == false)
{
- for (PropertyInfo property : properties)
+ Set<String> keys = null;
+ Set<PropertyInfo> properties = beanInfo.getProperties();
+ if (properties != null && properties.size() > 0)
{
- // Do we ignore this property?
- CompositeValue compositeValue = property.getUnderlyingAnnotation(CompositeValue.class);
- if (compositeValue != null && compositeValue.ignore())
- continue;
-
- String name = property.getName();
- if ("class".equals(name) == false)
+ for (PropertyInfo property : properties)
{
- if (compositeValue != null)
+ // Do we ignore this property?
+ CompositeValue compositeValue = property.getUnderlyingAnnotation(CompositeValue.class);
+ if (compositeValue != null && compositeValue.ignore())
+ continue;
+
+ String name = property.getName();
+ if ("class".equals(name) == false)
{
- String compositeValueName = compositeValue.name();
- if (MetaTypeConstants.DEFAULT.equals(compositeValueName) == false)
- name = compositeValueName;
+ if (compositeValue != null)
+ {
+ String compositeValueName = compositeValue.name();
+ if (MetaTypeConstants.DEFAULT.equals(compositeValueName) == false)
+ name = compositeValueName;
+ }
+
+ TypeInfo itemTypeInfo = property.getType();
+ MetaType metaType = resolve(itemTypeInfo);
+ result.addItem(name, name, metaType);
+ if (property.isAnnotationPresent(CompositeKey.class))
+ {
+ if (keys == null)
+ keys = new LinkedHashSet<String>();
+ keys.add(name);
+ }
}
-
- TypeInfo itemTypeInfo = property.getType();
- MetaType metaType = resolve(itemTypeInfo);
- result.addItem(name, name, metaType);
- if (property.isAnnotationPresent(CompositeKey.class))
- {
- if (keys == null)
- keys = new LinkedHashSet<String>();
- keys.add(name);
- }
}
}
+ if (keys != null)
+ result.setKeys(keys);
}
- if (keys != null)
- result.setKeys(keys);
result.freeze();
return result;
}
Modified: projects/jboss-man/branches/Branch_2_1/pom.xml
===================================================================
--- projects/jboss-man/branches/Branch_2_1/pom.xml 2009-10-21 17:52:55 UTC (rev 95319)
+++ projects/jboss-man/branches/Branch_2_1/pom.xml 2009-10-21 17:56:42 UTC (rev 95320)
@@ -19,15 +19,15 @@
</scm>
<properties>
- <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
+ <version.jboss.common.core>2.2.16.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.2.GA</version.org.jboss.reflect>
- <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
+ <version.org.jboss.mdr>2.0.2.GA</version.org.jboss.mdr>
<version.org.jboss.test>1.1.3.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.11.0.GA</version.javassist>
</properties>
<modules>
@@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-7</version>
+ <version>2.0-beta-9</version>
<configuration>
<tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-man/tags</tagBase>
<autoVersionSubmodules>true</autoVersionSubmodules>
More information about the jboss-cvs-commits
mailing list