[jetty-commit] r850 - in jetty/trunk/jetty-centralized-logging: . src/ma

[genie@xxxxxxxxxxx]

Author: jerdfelt
Date: 2009-09-09 14:03:10 -0400 (Wed, 09 Sep 2009)
New Revision: 850

Modified:
   jetty/trunk/jetty-centralized-logging/pom.xml
   jetty/trunk/jetty-centralized-logging/src/main/java/org/eclipse/jetty/logging/impl/CentralLoggerConfig.java
Log:
Fixing command line build failure

Modified: jetty/trunk/jetty-centralized-logging/pom.xml
===================================================================
--- jetty/trunk/jetty-centralized-logging/pom.xml	2009-09-09 12:53:23 UTC (rev 849)
+++ jetty/trunk/jetty-centralized-logging/pom.xml	2009-09-09 18:03:10 UTC (rev 850)
@@ -28,27 +28,6 @@
   <artifactId>jetty-centralized-logging</artifactId>
   <name>Jetty :: Centralized Logging</name>
   <packaging>jar</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>config.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

Modified: jetty/trunk/jetty-centralized-logging/src/main/java/org/eclipse/jetty/logging/impl/CentralLoggerConfig.java
===================================================================
--- jetty/trunk/jetty-centralized-logging/src/main/java/org/eclipse/jetty/logging/impl/CentralLoggerConfig.java	2009-09-09 12:53:23 UTC (rev 849)
+++ jetty/trunk/jetty-centralized-logging/src/main/java/org/eclipse/jetty/logging/impl/CentralLoggerConfig.java	2009-09-09 18:03:10 UTC (rev 850)
@@ -232,6 +232,7 @@
         root.appenders = getAppenders(props,"root.appenders",declaredAppenders);
         if (root.appenders == null)
         {
+            root.appenders = new ArrayList<Appender>();
             // Default (if not specified for root)
             root.appenders.add(new ConsoleAppender());
         }