Adding System.Property support to RollingFileAppender

* Adding ability to specify system properties like "${user.dir}"
  to the RollingFileAppender.filename configuration options.
* Adding -config artifact creation.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@851 7e9141cc-0065-0410-87d8-b60c137991c4

jetty-centralized-logging/pom.xml

@@ -28,6 +28,27 @@
   <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>

jetty-centralized-logging/src/main/config/etc/centralized-logging/testing.properties

@@ -0,0 +1,8 @@
+root.level=INFO
+root.appenders=roll
+
+appender.roll.class=org.eclipse.jetty.logging.impl.RollingFileAppender
+appender.roll.filename=${jetty.home}/logs/central.log
+appender.roll.append=true
+appender.roll.retainDays=120
+

jetty-centralized-logging/src/main/config/etc/jetty-centralized-logging.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Enable Centralized Logging in the Jetty Server                  -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <Call name="addBean">
+    <Arg>
+      <New class="org.eclipse.jetty.logging.CentralizedLogging">
+        <Set name="server"><Ref id="Server" /></Set>
+        <Set name="configurationFilename"><SystemProperty name="jetty.home" default="."/>/etc/centralized-logging/logging.properties</Set>
+      </New>
+    </Arg>
+  </Call>
+</Configure>

jetty-centralized-logging/src/main/java/org/eclipse/jetty/logging/PropertyExpansion.java

@@ -0,0 +1,45 @@
+// ========================================================================
+// Copyright (c) Webtide LLC
+// ------------------------------------------------------------------------
+// All rights reserved. This program and the accompanying materials
+// are made available under the terms of the Eclipse Public License v1.0
+// and Apache License v2.0 which accompanies this distribution.
+//
+// The Eclipse Public License is available at 
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// The Apache License v2.0 is available at
+// http://www.apache.org/licenses/LICENSE-2.0.txt
+//
+// You may elect to redistribute this code under either of these licenses. 
+// ========================================================================
+package org.eclipse.jetty.logging;
+
+/**
+ * Basic System Property string expansion "${user.home}"
+ */
+public class PropertyExpansion
+{
+    public static String expand(String s)
+    {
+        int i1 = 0;
+        int i2 = 0;
+
+        i1 = 0;
+        i2 = 0;
+        while (s != null)
+        {
+            i1 = s.indexOf("${",i2);
+            if (i1 < 0)
+                break;
+            i2 = s.indexOf("}",i1 + 2);
+            if (i2 < 0)
+                break;
+            String name = s.substring(i1 + 2,i2);
+            String property = System.getProperty(name,"${" + name + "}");
+            s = s.substring(0,i1) + property + s.substring(i2 + 1);
+        }
+
+        return s;
+    }
+}

jetty-centralized-logging/src/main/java/org/eclipse/jetty/logging/impl/RollingFileAppender.java

@@ -15,10 +15,13 @@
 // ========================================================================
 package org.eclipse.jetty.logging.impl;
 
+import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.TimeZone;
 
+import org.eclipse.jetty.logging.PropertyExpansion;
 import org.eclipse.jetty.util.RolloverFileOutputStream;
 
 /**
@@ -28,6 +31,7 @@ public class RollingFileAppender implements Appender
 {
     private RolloverFileOutputStream out;
     private String filename;
+    private File file;
     private boolean append = true;
     private int retainDays = 31;
     private TimeZone zone = TimeZone.getDefault();
@@ -98,9 +102,27 @@ public class RollingFileAppender implements Appender
         return append;
     }
 
+    public File getFile()
+    {
+        return file;
+    }
+
     public void open() throws IOException
     {
-        out = new RolloverFileOutputStream(filename,append,retainDays,zone,dateFormat,backupFormat);
+        file = new File(PropertyExpansion.expand(filename));
+
+        File logDir = file.getParentFile();
+        if (!logDir.exists())
+        {
+            throw new FileNotFoundException("Logging directory does not exist: " + logDir);
+        }
+
+        if (!logDir.isDirectory())
+        {
+            throw new FileNotFoundException("Logging path exist, but is not a directory: " + logDir);
+        }
+
+        out = new RolloverFileOutputStream(file.getAbsolutePath(),append,retainDays,zone,dateFormat,backupFormat);
     }
 
     public void setAppend(boolean append)

jetty-centralized-logging/src/test/java/org/eclipse/jetty/logging/impl/ConfiguredLoggerTest.java

@@ -127,12 +127,13 @@ public class ConfiguredLoggerTest extends TestCase
 
         File testLoggingDir = new File(MavenTestingUtils.getTargetTestingDir(this),"logs");
         testLoggingDir.mkdirs();
-        File logFile = new File(testLoggingDir,"rolling.log");
+
+        System.setProperty("test.dir",testLoggingDir.getAbsolutePath());
 
         props.setProperty("root.level","DEBUG");
         props.setProperty("root.appenders","roll");
         props.setProperty("appender.roll.class",RollingFileAppender.class.getName());
-        props.setProperty("appender.roll.filename",logFile.getAbsolutePath());
+        props.setProperty("appender.roll.filename","${test.dir}/rolling.log");
         props.setProperty("appender.roll.append","true");
         props.setProperty("appender.roll.retainDays","120");
         props.setProperty("appender.roll.zone","GMT");
@@ -144,8 +145,10 @@ public class ConfiguredLoggerTest extends TestCase
         assertSeverityLevel(root,Severity.DEBUG);
         assertAppenders(root,RollingFileAppender.class);
 
+        File logFile = new File(testLoggingDir,"rolling.log");
+
         RollingFileAppender actualAppender = (RollingFileAppender)root.getAppenders().get(0);
-        assertEquals("RollingFileAppender.filename",logFile.getAbsolutePath(),actualAppender.getFilename());
+        assertEquals("RollingFileAppender.filename",logFile.getAbsolutePath(),actualAppender.getFile().getAbsolutePath());
         assertEquals("RollingFileAppender.append",true,actualAppender.isAppend());
         assertEquals("RollingFileAppender.retainDays",120,actualAppender.getRetainDays());
         assertEquals("RollingFileAppender.zone","GMT",actualAppender.getZone().getID());

jetty-distribution/pom.xml

@@ -29,45 +29,46 @@
         </executions>      
       </plugin>   
       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
-	  <artifactId>maven-antrun-plugin</artifactId>
+        <artifactId>maven-antrun-plugin</artifactId>
-          <executions>
+        <executions>
-            <execution>
+          <execution>
-	      <phase>generate-resources</phase>
+            <phase>generate-resources</phase>
-	      <goals>
+            <goals>
-		<goal>run</goal>
+              <goal>run</goal>
-              </goals>
+            </goals>
-              <configuration>
+            <configuration>
-                <tasks>
+              <tasks>
-		  <mkdir dir="${assembly.directory}/lib" />
+                <property name="orbit.base.url" value="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles" />
-                  <get src="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.servlet_2.5.0.v200806031605.jar" dest="${assembly.directory}/lib/servlet-api-2.5.jar" usetimestamp="true" verbose="true" />
+                <mkdir dir="${assembly.directory}/lib" />
-		  <mkdir dir="${assembly.directory}/lib/jndi" />
+                <get src="${orbit.base.url}/javax.servlet_2.5.0.v200806031605.jar" dest="${assembly.directory}/lib/servlet-api-2.5.jar" usetimestamp="true" verbose="true" />
-                  <get src="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.activation_1.1.0.v200905021805.jar" dest="${assembly.directory}/lib/jndi/activation-1.1.jar" usetimestamp="true" verbose="true" />
+                <mkdir dir="${assembly.directory}/lib/jndi" />
-                  <get src="http://download.eclipse.org/tools/orbit/downloads/drops/R20090529135407/bundles/javax.mail_1.4.0.v200905040518.jar" dest="${assembly.directory}/lib/jndi/mail-1.4.jar" usetimestamp="true" verbose="true" />
+                <get src="${orbit.base.url}/javax.activation_1.1.0.v200905021805.jar" dest="${assembly.directory}/lib/jndi/activation-1.1.jar" usetimestamp="true" verbose="true" />
-                </tasks>
+                <get src="${orbit.base.url}/javax.mail_1.4.0.v200905040518.jar" dest="${assembly.directory}/lib/jndi/mail-1.4.jar" usetimestamp="true" verbose="true" />
-              </configuration>
+              </tasks>
-            </execution>
+            </configuration>
-          </executions>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
-          <executions>
+        <executions>
-            <execution>
+          <execution>
-              <phase>generate-resources</phase>
+            <phase>generate-resources</phase>
-              <goals>
+            <goals>
-                <goal>process</goal>
+              <goal>process</goal>
-              </goals>
+            </goals>
-              <configuration>
+            <configuration>
-                <resourceBundles>
+              <resourceBundles>
-                  <resourceBundle>org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.0</resourceBundle>
+                <resourceBundle>org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.0</resourceBundle>
-                  <resourceBundle>org.eclipse.jetty.toolchain:jetty-distribution-remote-resources:1.1</resourceBundle>
+                <resourceBundle>org.eclipse.jetty.toolchain:jetty-distribution-remote-resources:1.1</resourceBundle>
-                </resourceBundles>
+              </resourceBundles>
-                <outputDirectory>${assembly.directory}</outputDirectory>
+              <outputDirectory>${assembly.directory}</outputDirectory>
-              </configuration>
+            </configuration>
-            </execution>
+          </execution>
-          </executions>
+        </executions>
-        </plugin>
+      </plugin>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>2.1</version>
@@ -150,6 +151,16 @@
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty</groupId>
+                  <artifactId>jetty-centralized-logging</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>config</classifier>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <includes>**</includes>
+                  <outputDirectory>${assembly.directory}</outputDirectory>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-plus</artifactId>
@@ -182,7 +193,7 @@
                 </artifactItem>
               </artifactItems>
             </configuration>
-          </execution>                 
+          </execution>
           <execution>
             <id>copy</id>
             <phase>generate-resources</phase>
@@ -190,7 +201,7 @@
               <goal>copy</goal>
             </goals>
             <configuration>
-              <artifactItems>             
+              <artifactItems>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-util</artifactId>
@@ -272,7 +283,7 @@
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
                 </artifactItem>
-                 <artifactItem>
+                <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-webapp-verifier</artifactId>
                   <version>${project.version}</version>
@@ -281,6 +292,15 @@
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty</groupId>
+                  <artifactId>jetty-centralized-logging</artifactId>
+                  <version>${project.version}</version>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <includes>**</includes>
+                  <outputDirectory>${assembly.directory}/lib/centralized-logging</outputDirectory>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-deploy</artifactId>
@@ -289,7 +309,7 @@
                   <overWrite>true</overWrite>
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
-                </artifactItem>              
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-jmx</artifactId>
@@ -298,7 +318,7 @@
                   <overWrite>true</overWrite>
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
-                </artifactItem>            
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-rewrite</artifactId>
@@ -334,7 +354,7 @@
                   <overWrite>true</overWrite>
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
-                </artifactItem>             
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-jndi</artifactId>
@@ -361,7 +381,7 @@
                   <overWrite>true</overWrite>
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
-                </artifactItem>  
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>jetty-continuation</artifactId>
@@ -370,7 +390,7 @@
                   <overWrite>true</overWrite>
                   <includes>**</includes>
                   <outputDirectory>${assembly.directory}/lib</outputDirectory>
-                </artifactItem>  
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.eclipse.jetty</groupId>
                   <artifactId>test-jetty-webapp</artifactId>
@@ -431,7 +451,7 @@
           </execution>
           -->
         </executions>
-      </plugin>     
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -455,34 +475,34 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-deploy</artifactId>
+      <artifactId>jetty-deploy</artifactId>
-        <version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-rewrite</artifactId>
+      <artifactId>jetty-rewrite</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-ajp</artifactId>
+      <artifactId>jetty-ajp</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-annotations</artifactId>
+      <artifactId>jetty-annotations</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-        <artifactId>test-jetty-webapp</artifactId>
+      <artifactId>test-jetty-webapp</artifactId>
-        <type>war</type>
+      <type>war</type>
-        <version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-jmx</artifactId>
+      <artifactId>jetty-jmx</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -491,28 +511,28 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-plus</artifactId>
+      <artifactId>jetty-plus</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-    	<groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-client</artifactId>
+      <artifactId>jetty-client</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-    	<groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-continuation</artifactId>
+      <artifactId>jetty-continuation</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-    	<groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-start</artifactId>
+      <artifactId>jetty-start</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-    	<groupId>org.eclipse.jetty</groupId>
+      <groupId>org.eclipse.jetty</groupId>
-    	<artifactId>jetty-policy</artifactId>
+      <artifactId>jetty-policy</artifactId>
-    	<version>${project.version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>