[jboss-cvs] JBossAS SVN: r110353 - in projects/logging-service-metadata/trunk: src/main/java/org/jboss/logging/metadata and 1 other directory.

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

Author: david.lloyd at jboss.com
Date: 2011-01-13 11:01:20 -0500 (Thu, 13 Jan 2011)
New Revision: 110353

Modified:
   projects/logging-service-metadata/trunk/pom.xml
   projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java
Log:
Inject formatter into appender; activate appender on start

Modified: projects/logging-service-metadata/trunk/pom.xml
===================================================================
--- projects/logging-service-metadata/trunk/pom.xml	2011-01-13 15:43:30 UTC (rev 110352)
+++ projects/logging-service-metadata/trunk/pom.xml	2011-01-13 16:01:20 UTC (rev 110353)
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.jboss.logmanager</groupId>
             <artifactId>jboss-logmanager</artifactId>
-            <version>1.2.0.CR9</version>
+            <version>1.2.0.CR10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.logmanager</groupId>
             <artifactId>jboss-logmanager-log4j</artifactId>
-            <version>1.0.0.CR3</version>
+            <version>1.0.0.CR4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

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	2011-01-13 15:43:30 UTC (rev 110352)
+++ projects/logging-service-metadata/trunk/src/main/java/org/jboss/logging/metadata/LoggingMetaDataHelper.java	2011-01-13 16:01:20 UTC (rev 110353)
@@ -30,6 +30,7 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Filter;
+import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.regex.Matcher;
@@ -58,6 +59,7 @@
 import org.jboss.logmanager.handlers.NullHandler;
 import org.jboss.logmanager.handlers.PeriodicRotatingFileHandler;
 import org.jboss.logmanager.handlers.SizeRotatingFileHandler;
+import org.jboss.logmanager.log4j.handlers.FormatterLayout;
 import org.jboss.logmanager.log4j.handlers.Log4jAppenderHandler;
 
 public final class LoggingMetaDataHelper {
@@ -210,11 +212,15 @@
         } else if (handlerMetaData instanceof Log4jAppenderMetaData) {
             final Log4jAppenderMetaData appenderMetaData = (Log4jAppenderMetaData) handlerMetaData;
             final String log4jTargetName = targetName + ":log4j";
+            // Create the appender
             final BeanMetaDataBuilder appenderBuilder = BeanMetaDataBuilder.createBuilder(log4jTargetName, null);
             propertyTarget = appenderBuilder;
+            appenderBuilder.setBean(appenderMetaData.getClassName());
+            appenderBuilder.setStart("activateOptions");
+            // Now create the actual handler and inject the appender
             builder.setBean(Log4jAppenderHandler.class.getName());
             builder.addConstructorParameter("org.apache.log4j.Appender", builder.createInject(log4jTargetName));
-            appenderBuilder.setBean(appenderMetaData.getClassName());
+            builder.addConstructorParameter(boolean.class.getName(), Boolean.TRUE);
         } else if (handlerMetaData instanceof NullHandlerMetaData) {
             builder.setBean(NullHandler.class.getName());
         } else if (handlerMetaData instanceof RefMetaData) {