[jboss-osgi-commits] JBoss-OSGI SVN: r94306 - in projects/jboss-osgi/projects/runtime/microcontainer/trunk: src/etc/osgitck and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2009-10-02 19:23:06 -0400 (Fri, 02 Oct 2009) New Revision: 94306 Added: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/log4j.xml Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/scripts/assembly-all.xml projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml Log: Remove dependency on log4j.output.dir Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/scripts/assembly-all.xml =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/scripts/assembly-all.xml 2009-10-02 22:58:52 UTC (rev 94305) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/scripts/assembly-all.xml 2009-10-02 23:23:06 UTC (rev 94306) @@ -64,17 +64,11 @@ <outputDirectory>/</outputDirectory> </fileSet> <fileSet> - <directory>target/test-classes</directory> - <outputDirectory>/</outputDirectory> - <includes> - <include>log4j.xml</include> - </includes> - </fileSet> - <fileSet> <directory>src/etc/osgitck</directory> <outputDirectory>/</outputDirectory> <includes> <include>jboss-osgi-bootstrap.xml</include> + <include>log4j.xml</include> </includes> </fileSet> </fileSets> Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2009-10-02 22:58:52 UTC (rev 94305) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2009-10-02 23:23:06 UTC (rev 94306) @@ -15,7 +15,7 @@ </constructor> <property name="properties"> <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry> + <entry><key>org.osgi.framework.storage</key><value>./generated/osgi-store</value></entry> <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> Added: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/log4j.xml =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/log4j.xml (rev 0) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/etc/osgitck/log4j.xml 2009-10-02 23:23:06 UTC (rev 94306) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <!-- ================================= --> + <!-- Preserve messages in a local file --> + <!-- ================================= --> + + <appender name="FILE" class="org.apache.log4j.FileAppender"> + <param name="File" value="./generated/jboss-osgi-framework.log"/> + <param name="Append" value="false"/> + <layout class="org.apache.log4j.PatternLayout"> + <!-- The default pattern: Date Priority [Category] Message\n --> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + + <!-- ============================== --> + <!-- Append messages to the console --> + <!-- ============================== --> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out" /> + <param name="Threshold" value="INFO" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" /> + </layout> + </appender> + + <!-- ================ --> + <!-- Limit categories --> + <!-- ================ --> + + <!-- Show jboss deployer traces + <category name="org.jboss.deployer"> + <priority value="TRACE" /> + </category> + --> + + <!-- ======================= --> + <!-- Setup the Root category --> + <!-- ======================= --> + + <root> + <!--appender-ref ref="CONSOLE"/--> + <appender-ref ref="FILE"/> + </root> + +</log4j:configuration>