July 2006 - logback-dev - mailman3.qos.ch

svn commit: r59 - logback/core/trunk/src/main/java/ch/qos/logback/core/status
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 15:38:11 2006 New Revision: 59 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java Log: added getCount() method Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusManager.java Thu Jul 13 15:38:11 2006 @@ -16,4 +16,9 @@ public void add(Status status); public Iterator iterator(); public int getLevel(); + /** + * Return the number of entries. + * @return + */ + public int getCount(); }

1 0

svn commit: r58 - logback/core/trunk/src/main/java/ch/qos/logback/core
by noreply.seb＠qos.ch 13 Jul '06

13 Jul '06

Author: seb Date: Thu Jul 13 15:37:57 2006 New Revision: 58 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java Log: added getCount() method Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/BasicStatusManager.java Thu Jul 13 15:37:57 2006 @@ -46,4 +46,9 @@ return level; } + public int getCount() { + return count; + } + + }

1 0

svn commit: r57 - logback/core/trunk
by noreply.ceki＠qos.ch 11 Jul '06

11 Jul '06

Author: ceki Date: Tue Jul 11 21:09:17 2006 New Revision: 57 Modified: logback/core/trunk/pom.xml Log: latest attempt Modified: logback/core/trunk/pom.xml ============================================================================== --- logback/core/trunk/pom.xml (original) +++ logback/core/trunk/pom.xml Tue Jul 11 21:09:17 2006 @@ -6,9 +6,11 @@ <groupId>qos.ch</groupId> <artifactId>logback-core</artifactId> <packaging>jar</packaging> - <version>1.0-SNAPSHOT</version> - <name>Maven Quick Start Archetype</name> - <url>http://maven.apache.org</url> + <version>0.1-SNAPSHOT</version> + <name>Logback Core Module</name> + + <url>http://logback.qos.ch</url> + <dependencies> <dependency> <groupId>janino</groupId> @@ -27,18 +29,41 @@ <build> <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <workingDirectory>${basedir}/src/test</workingDirectory> + <forkMode>once</forkMode> + <reportFormat>plain</reportFormat> + <workingDirectory>${basedir}/src/test</workingDirectory> <excludes> - + <exclude>**/AllTest.java</exclude> + <exclude>**/PackageTest.java</exclude> + <exclude>**/RenamingTest.java</exclude> + <exclude>**/SizeBasedRollingTest.java</exclude> + <exclude>**/TimeBasedRollingTest.java</exclude> </excludes> </configuration> </plugin> + + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + </plugin> + +  </plugins> - </build> + </build> + </project> \ No newline at end of file

1 0

svn commit: r56 - logback/core/trunk
by noreply.seb＠qos.ch 11 Jul '06

11 Jul '06

Author: seb Date: Tue Jul 11 20:45:44 2006 New Revision: 56 Modified: logback/core/trunk/build.xml Log: added janino.jar to classpath Modified: logback/core/trunk/build.xml ============================================================================== --- logback/core/trunk/build.xml (original) +++ logback/core/trunk/build.xml Tue Jul 11 20:45:44 2006 @@ -7,7 +7,7 @@ <property name="source.home" value="./src/main/java/" /> <property name="javac.dest" value="./target/classes" /> - + <property name="deprecation" value="on" /> <property name="debug" value="on" /> @@ -19,6 +19,7 @@ <path id="core.classpath"> <pathelement location="${source.home}" /> <pathelement location="${javac.dest}" /> + <pathelement location="lib/janino.jar"/> </path>

1 0

svn commit: r55 - logback/classic/trunk/test/src/java/ch/qos/logback/classic/pattern
by noreply.seb＠qos.ch 11 Jul '06

11 Jul '06

Author: seb Date: Tue Jul 11 20:09:30 2006 New Revision: 55 Modified: logback/classic/trunk/test/src/java/ch/qos/logback/classic/pattern/ConverterTest.java Log: minor fix Modified: logback/classic/trunk/test/src/java/ch/qos/logback/classic/pattern/ConverterTest.java ============================================================================== --- logback/classic/trunk/test/src/java/ch/qos/logback/classic/pattern/ConverterTest.java (original) +++ logback/classic/trunk/test/src/java/ch/qos/logback/classic/pattern/ConverterTest.java Tue Jul 11 20:09:30 2006 @@ -82,7 +82,7 @@ StringBuffer buf = new StringBuffer(); converter.write(buf, le); // the number below should be the line number of the previous line - assertEquals("82", buf.toString()); + assertEquals("83", buf.toString()); } } @@ -156,7 +156,7 @@ converter.start(); StringBuffer buf = new StringBuffer(); converter.write(buf, le); - assertEquals("c.l.c.p.ConverterTest", buf.toString()); + assertEquals("c.q.l.c.p.ConverterTest", buf.toString()); } }

1 0

svn commit: r54 - logback/classic/trunk/test/src/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 11 Jul '06

11 Jul '06

Author: seb Date: Tue Jul 11 20:09:08 2006 New Revision: 54 Modified: logback/classic/trunk/test/src/java/ch/qos/logback/classic/PatternLayoutTest.java Log: minor fix Modified: logback/classic/trunk/test/src/java/ch/qos/logback/classic/PatternLayoutTest.java ============================================================================== --- logback/classic/trunk/test/src/java/ch/qos/logback/classic/PatternLayoutTest.java (original) +++ logback/classic/trunk/test/src/java/ch/qos/logback/classic/PatternLayoutTest.java Tue Jul 11 20:09:08 2006 @@ -63,8 +63,8 @@ pl.setContext(context); pl.start(); String val = pl.doLayout(getEventObject()); - // 2006-02-01 22:38:06,212 INFO [main] c.l.pattern.ConverterTest - Some message - String regex = Contants4T.ISO_REGEX+" INFO \\[main] c.l.c.pattern.ConverterTest - Some message\\s*"; + // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some message + String regex = Contants4T.ISO_REGEX+" INFO \\[main] c.q.l.c.pattern.ConverterTest - Some message\\s*"; assertTrue(val.matches(regex)); }

1 0

svn commit: r53 - logback/core/trunk
by noreply.ceki＠qos.ch 08 Jul '06

08 Jul '06

Author: ceki Date: Sat Jul 8 18:48:35 2006 New Revision: 53 Modified: logback/core/trunk/ (props changed) Log: changes to .ignore file

1 0

svn commit: r52 - logback/core/trunk
by noreply.ceki＠qos.ch 08 Jul '06

08 Jul '06

Author: ceki Date: Sat Jul 8 18:46:37 2006 New Revision: 52 Added: logback/core/trunk/build.properties logback/core/trunk/pom.xml Modified: logback/core/trunk/build.xml Log: aligning ant build files to reflect changes caused by maven2 directory structure alignment Added: logback/core/trunk/build.properties ============================================================================== --- (empty file) +++ logback/core/trunk/build.properties Sat Jul 8 18:46:37 2006 @@ -0,0 +1 @@ +version=0.1 \ No newline at end of file Modified: logback/core/trunk/build.xml ============================================================================== --- logback/core/trunk/build.xml (original) +++ logback/core/trunk/build.xml Sat Jul 8 18:46:37 2006 @@ -5,8 +5,8 @@  <property name="base" value="." /> - <property name="source.home" value="./src/java/" /> - <property name="javac.dest" value="./classes" /> + <property name="source.home" value="./src/main/java/" /> + <property name="javac.dest" value="./target/classes" /> <property name="deprecation" value="on" /> <property name="debug" value="on" /> @@ -74,9 +74,9 @@ </fileset> </delete> - <jar jarfile="logback-core.jar" basedir="${javac.dest}" + <jar jarfile="logback-core-${version}.jar" basedir="${javac.dest}" includes="${stem}/**/*.class" - excludes="**/UnitTest**"> + excludes="**/*Test**"> <manifest> <section name="com/logback/core"> Added: logback/core/trunk/pom.xml ============================================================================== --- (empty file) +++ logback/core/trunk/pom.xml Sat Jul 8 18:46:37 2006 @@ -0,0 +1,44 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>qos.ch</groupId> + <artifactId>logback-core</artifactId> + <packaging>jar</packaging> + <version>1.0-SNAPSHOT</version> + <name>Maven Quick Start Archetype</name> + <url>http://maven.apache.org</url> + <dependencies> + <dependency> + <groupId>janino</groupId> + <artifactId>janino</artifactId> + <version>2.4.3</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <workingDirectory>${basedir}/src/test</workingDirectory> + <excludes> + + </excludes> + </configuration> + </plugin> + </plugins> + </build> + + +</project> \ No newline at end of file

1 0

svn commit: r51 - logback/core/trunk/src/test
by noreply.ceki＠qos.ch 08 Jul '06

08 Jul '06

Author: ceki Date: Sat Jul 8 18:43:57 2006 New Revision: 51 Modified: logback/core/trunk/src/test/build.xml Log: package prefix changed from com.logback to ch.qos.logback Modified: logback/core/trunk/src/test/build.xml ============================================================================== --- logback/core/trunk/src/test/build.xml (original) +++ logback/core/trunk/src/test/build.xml Sat Jul 8 18:43:57 2006 @@ -5,17 +5,20 @@  <property name="base" value="." /> + <property name="target" value="../../target" /> +  - <property name="project.source.home" value="../src/java/" /> - <property name="project.classes.home" value="../classes/" /> - <property name="tests.source.home" value="./src/java/" /> + <property name="project.source.home" value="../src/main/java/" /> + <property name="project.classes.home" value="${target}/classes/" /> + + <property name="tests.source.home" value="./java/" />  <property name="stem" value="com/logback/core" />  - <property name="javac.dest" value="./classes" /> + <property name="javac.dest" value="${target}/test-classes/" /> <path id="tests.classpath"> @@ -24,7 +27,7 @@ <pathelement location="${tests.source.home}" /> <pathelement location="${javac.dest}" /> <pathelement location="./resources" /> - <fileset dir="./lib/"> + <fileset dir="../../lib/"> <include name="*.jar" /> </fileset> </path> @@ -87,13 +90,13 @@   <target name="parentBuild"> - <ant dir=".." target="build" inheritRefs="true" /> + <ant dir="../.." target="build" inheritRefs="false" /> </target>    - <target name="build" depends="parentBuild, prepare"> + <target name="build" depends="prepare"> <property name="haltonfailure" value="yes" /> <javac srcdir="${tests.source.home}" destdir="${javac.dest}" excludes="${stem}/xynz/toto.java" deprecation="${deprecation}" debug="on"> <classpath refid="tests.classpath" /> @@ -127,7 +130,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.AllTest" /> + <test name="ch.qos.logback.core.AllTest" /> </junit> </target> @@ -140,7 +143,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.rolling.helper.CompressTest" /> + <test name="ch.qos.logback.core.rolling.helper.CompressTest" /> </junit> </target> @@ -148,7 +151,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.rolling.RenamingTest" /> + <test name="ch.qos.logback.core.rolling.RenamingTest" /> </junit> </target> @@ -156,7 +159,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath" /> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.rolling.TimeBasedRollingTest" /> + <test name="ch.qos.logback.core.rolling.TimeBasedRollingTest" /> </junit> </target> @@ -164,7 +167,7 @@ <junit printsummary="yes" fork="yes" haltonfailure="yes"> <classpath refid="tests.classpath"/> <formatter type="plain" usefile="false" /> - <test name="com.logback.core.joran.SkippingInInterpreterTest" /> + <test name="ch.qos.logback.core.joran.SkippingInInterpreterTest" /> </junit> </target>

1 0

svn commit: r50 - logback/core/trunk/src/test/src
by noreply.ceki＠qos.ch 07 Jul '06

07 Jul '06

Author: ceki Date: Fri Jul 7 20:54:53 2006 New Revision: 50 Removed: logback/core/trunk/src/test/src/ Log: aligning with maven2 directory structure

1 0