[jboss-cvs] JBossAS SVN: r90987 - projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata.

[jboss-cvs-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-07-09 02:14:27 -0400 (Thu, 09 Jul 2009)
New Revision: 90987

Modified:
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java
Log:
More JBossXB fixes

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java	2009-07-09 06:01:51 UTC (rev 90986)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java	2009-07-09 06:14:27 UTC (rev 90987)
@@ -30,6 +30,7 @@
 import javax.xml.bind.annotation.XmlAttribute;
 
 import org.jboss.beans.metadata.spi.PropertyMetaData;
+import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
 
 public abstract class AbstractHandlerMetaData {
     private RefMetaData levelMetaData;
@@ -116,7 +117,7 @@
     }
 
     @XmlElementWrapper(name="properties")
-    @XmlElement(name="property")
+    @XmlElement(name="property", type=AbstractPropertyMetaData.class)
     public void setPropertyMetaDataList(final List<PropertyMetaData> propertyMetaDataList) {
         this.propertyMetaDataList = propertyMetaDataList;
     }

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java	2009-07-09 06:01:51 UTC (rev 90986)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java	2009-07-09 06:14:27 UTC (rev 90987)
@@ -23,6 +23,8 @@
 package org.jboss.logging.metadata;
 
 import org.jboss.xb.annotations.JBossXmlSchema;
+import org.jboss.xb.annotations.JBossXmlConstants;
+import org.jboss.xb.annotations.JBossXmlType;
 import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
 
@@ -43,6 +45,7 @@
 @JBossXmlSchema(namespace = "urn:jboss:logging:6.0", elementFormDefault = XmlNsForm.QUALIFIED)
 @XmlRootElement(name = "jboss-logging")
 @XmlType(name = "jboss-logging", propOrder = {})
+ at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_CHOICE)
 public class LoggingMetaData implements BeanMetaDataFactory {
     private List<AbstractLoggerMetaData> loggerMetaDataList;
     private List<AbstractHandlerMetaData> handlerMetaDataList;