[jboss-cvs] JBossAS SVN: r91028 - 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 17:18:54 -0400 (Thu, 09 Jul 2009)
New Revision: 91028

Modified:
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java
   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/LoggingMetaDataHelper.java
Log:
Forgot a couple handler types

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java	2009-07-09 20:45:41 UTC (rev 91027)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractLoggerMetaData.java	2009-07-09 21:18:54 UTC (rev 91028)
@@ -28,10 +28,12 @@
 import javax.xml.bind.annotation.XmlElements;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
+import org.jboss.beans.metadata.plugins.AbstractValueMetaData;
+
 public abstract class AbstractLoggerMetaData {
     private RefMetaData levelMetaData;
     private FilterMetaData filterMetaData;
-    private List<AbstractHandlerMetaData> handlerMetaDataList;
+    private List<Object> handlerMetaDataList;
 
     public RefMetaData getLevelMetaData() {
         return levelMetaData;
@@ -51,7 +53,7 @@
         this.filterMetaData = filterMetaData;
     }
 
-    public List<AbstractHandlerMetaData> getHandlerMetaDataList() {
+    public List<Object> getHandlerMetaDataList() {
         return handlerMetaDataList;
     }
 
@@ -64,9 +66,11 @@
             @XmlElement(name = "periodic-rotating-file-handler", type = PeriodicRotatingFileHandlerMetaData.class),
             @XmlElement(name = "size-rotating-file-handler", type = SizeRotatingFileHandlerMetaData.class),
             @XmlElement(name = "async-handler", type = AsyncHandlerMetaData.class),
-            @XmlElement(name = "null-handler", type = NullHandlerMetaData.class)
+            @XmlElement(name = "null-handler", type = NullHandlerMetaData.class),
+            @XmlElement(name = "handler-ref", type = RefMetaData.class),
+            @XmlElement(name = "value", type = AbstractValueMetaData.class)
     })
-    public void setHandlerMetaDataList(final List<AbstractHandlerMetaData> handlerMetaDataList) {
+    public void setHandlerMetaDataList(final List<Object> handlerMetaDataList) {
         this.handlerMetaDataList = handlerMetaDataList;
     }
 }

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 20:45:41 UTC (rev 91027)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaData.java	2009-07-09 21:18:54 UTC (rev 91028)
@@ -45,7 +45,7 @@
 @JBossXmlSchema(namespace = "urn:jboss:logging:6.0", elementFormDefault = XmlNsForm.QUALIFIED)
 @XmlRootElement(name = "logging")
 @XmlType(name = "logging", propOrder = {})
- at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_CHOICE)
+ at JBossXmlType(modelGroup = JBossXmlConstants.MODEL_GROUP_UNORDERED_SEQUENCE)
 public class LoggingMetaData implements BeanMetaDataFactory {
     private List<AbstractLoggerMetaData> loggerMetaDataList;
     private List<AbstractHandlerMetaData> handlerMetaDataList;

Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java	2009-07-09 20:45:41 UTC (rev 91027)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java	2009-07-09 21:18:54 UTC (rev 91028)
@@ -129,10 +129,16 @@
         final BeanMetaData loggerBeanMetaData = builder.getBeanMetaData();
         // now install handlers
         final BeanMetaDataBuilder installerBuilder = BeanMetaDataBuilder.createBuilder(HandlerInstallerHelper.class.getName(), getInstallerName(context, name));
-        final List<AbstractHandlerMetaData> handlerMetaDataList = abstractLoggerMetaData.getHandlerMetaDataList();
+        final List<Object> handlerMetaDataList = abstractLoggerMetaData.getHandlerMetaDataList();
         final List<ValueMetaData> handlerList = builder.createList();
-        for (AbstractHandlerMetaData handlerMetaData : handlerMetaDataList) {
-            handlerList.add(getValue(beanMetaDataList, handlerMetaData, context));
+        for (Object handlerMetaData : handlerMetaDataList) {
+            if (handlerMetaData instanceof AbstractHandlerMetaData) {
+                handlerList.add(getValue(beanMetaDataList, (AbstractHandlerMetaData)handlerMetaData, context));
+            } else if (handlerMetaData instanceof ValueMetaData) {
+                handlerList.add((ValueMetaData) handlerMetaData);
+            } else {
+                handlerList.add(builder.createInject(getName(context, Kind.HANDLER, ((RefMetaData)handlerMetaData).getName())));
+            }
         }
         final List<ValueMetaData> targetList = builder.createList();
         targetList.add(loggerBeanMetaData);