[jboss-cvs] JBossAS SVN: r110180 - in projects/logging-service-metadata/trunk: src/main/java/org/jboss/logging/metadata and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Dec 23 10:53:44 EST 2010
Author: alesj
Date: 2010-12-23 10:53:44 -0500 (Thu, 23 Dec 2010)
New Revision: 110180
Modified:
projects/logging-service-metadata/trunk/pom.xml
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/LoggingMetaDataHelper.java
projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java
Log:
[JBAS-8771]; fix hanlder-ref on sub-handlers.
Update MC libs.
Modified: projects/logging-service-metadata/trunk/pom.xml
===================================================================
--- projects/logging-service-metadata/trunk/pom.xml 2010-12-23 15:14:14 UTC (rev 110179)
+++ projects/logging-service-metadata/trunk/pom.xml 2010-12-23 15:53:44 UTC (rev 110180)
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.0.0.Beta1</version>
+ <version>3.0.0.Beta4</version>
</dependency>
<dependency>
<groupId>org.jboss.logmanager</groupId>
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jbossxb</artifactId>
- <version>2.0.1.GA</version>
+ <version>2.0.2.GA</version>
</dependency>
<dependency>
<groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
- <version>2.1.1.GA</version>
+ <version>2.1.1.SP1</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
@@ -68,9 +68,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
+ <groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.9.GA</version>
+ <version>2.2.0.GA</version>
<exclusions>
<exclusion>
<groupId>org.jboss.logging</groupId>
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 2010-12-23 15:14:14 UTC (rev 110179)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/AbstractHandlerMetaData.java 2010-12-23 15:53:44 UTC (rev 110180)
@@ -22,13 +22,13 @@
package org.jboss.logging.metadata;
-import java.util.List;
-
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlElements;
-import javax.xml.bind.annotation.XmlAttribute;
+import java.util.List;
+
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
import org.jboss.beans.metadata.spi.PropertyMetaData;
@@ -106,7 +106,8 @@
@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)
})
public void setSubHandlerMetaDataList(final List<AbstractHandlerMetaData> subHandlerMetaDataList) {
this.subHandlerMetaDataList = subHandlerMetaDataList;
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 2010-12-23 15:14:14 UTC (rev 110179)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java 2010-12-23 15:53:44 UTC (rev 110180)
@@ -45,19 +45,10 @@
import org.jboss.beans.metadata.spi.ValueMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.dependency.spi.ControllerMode;
-import org.jboss.logmanager.Logger;
import org.jboss.logmanager.LogContext;
+import org.jboss.logmanager.Logger;
import org.jboss.logmanager.errormanager.OnlyOnceErrorManager;
-import org.jboss.logmanager.filters.AcceptAllFilter;
-import org.jboss.logmanager.filters.AllFilter;
-import org.jboss.logmanager.filters.AnyFilter;
-import org.jboss.logmanager.filters.DenyAllFilter;
-import org.jboss.logmanager.filters.InvertFilter;
-import org.jboss.logmanager.filters.LevelChangingFilter;
-import org.jboss.logmanager.filters.LevelFilter;
-import org.jboss.logmanager.filters.LevelRangeFilter;
-import org.jboss.logmanager.filters.RegexFilter;
-import org.jboss.logmanager.filters.SubstituteFilter;
+import org.jboss.logmanager.filters.*;
import org.jboss.logmanager.formatters.PatternFormatter;
import org.jboss.logmanager.handlers.AsyncHandler;
import org.jboss.logmanager.handlers.ConsoleHandler;
@@ -226,6 +217,8 @@
appenderBuilder.setBean(appenderMetaData.getClassName());
} else if (handlerMetaData instanceof NullHandlerMetaData) {
builder.setBean(NullHandler.class.getName());
+ } else if (handlerMetaData instanceof RefMetaData) {
+ return builder.createInject(name);
}
builder.setStop("close");
builder.setMode(ControllerMode.ON_DEMAND);
Modified: projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java
===================================================================
--- projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java 2010-12-23 15:14:14 UTC (rev 110179)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/RefMetaData.java 2010-12-23 15:53:44 UTC (rev 110180)
@@ -22,11 +22,11 @@
package org.jboss.logging.metadata;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlAttribute;
@XmlType(name = "refType", propOrder = {})
-public class RefMetaData {
+public class RefMetaData extends AbstractHandlerMetaData {
private String name;
public String getName() {
More information about the jboss-cvs-commits
mailing list