- logback-dev - mailman3.qos.ch

svn commit: r977 - in logback/trunk/logback-access/src: main/java/ch/qos/logback/access/filter test/java/ch/qos/logback/access test/java/ch/qos/logback/access/filter
by noreply.ceki＠qos.ch 21 Nov '06

21 Nov '06

Author: ceki Date: Tue Nov 21 21:48:36 2006 New Revision: 977 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/PeriodicStats.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByDay.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/PackageTest.java Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java Log: Initial work on periodic statistics counters Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStats.java Tue Nov 21 21:48:36 2006 @@ -5,8 +5,8 @@ long getTotal(); - long getDailyTotal(); - long getDailyAverage(); + long getLastDaysCount(); + double getDailyAverage(); long getWeeklyTotal(); Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/AccessStatsImpl.java Tue Nov 21 21:48:36 2006 @@ -1,30 +1,31 @@ package ch.qos.logback.access.filter; -public class AccessStatsImpl implements AccessStats { +import ch.qos.logback.core.spi.LifeCycle; + +public class AccessStatsImpl implements AccessStats, LifeCycle { final CountingFilter countingFilter; + boolean started; + + StatsByDay statsByDay = new StatsByDay(System.currentTimeMillis()); AccessStatsImpl(CountingFilter countingFilter) { this.countingFilter = countingFilter; } - - public long getDailyAverage() { - // TODO Auto-generated method stub - return 0; + + public double getDailyAverage() { + return statsByDay.getAverage(); } - public long getDailyTotal() { - // TODO Auto-generated method stub - return 0; + public long getLastDaysCount() { + return statsByDay.getLastCount(); } public long getMonthlyAverage() { - // TODO Auto-generated method stub return 0; } public long getMonthlyTotal() { - // TODO Auto-generated method stub return 0; } @@ -33,13 +34,33 @@ } public long getWeeklyAverage() { - // TODO Auto-generated method stub return 0; } public long getWeeklyTotal() { - // TODO Auto-generated method stub return 0; } + void refresh(long now) { + statsByDay.refresh(now, getTotal()); + } + + void refresh() { + long now = System.currentTimeMillis(); + refresh(now); + } + + public void start() { + started = true; + + } + + public boolean isStarted() { + return started; + } + + public void stop() { + started = false; + } + } Modified: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java ============================================================================== --- logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/CountingFilter.java Tue Nov 21 21:48:36 2006 @@ -20,9 +20,7 @@ @Override public FilterReply decide(Object event) { - total++; - return FilterReply.NEUTRAL; } @@ -31,8 +29,6 @@ } - - @Override public void start() { MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/PeriodicStats.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/PeriodicStats.java Tue Nov 21 21:48:36 2006 @@ -0,0 +1,36 @@ +package ch.qos.logback.access.filter; + + +abstract public class PeriodicStats { + + private long nextPeriodBegins = 0; + private long lastTotal = 0; + private long lastCount = 0; + + private double average; + private int n; + + PeriodicStats(long now) { + nextPeriodBegins = computeStartOfNextPeriod(now); + } + + void refresh(long now, long total) { + if (now > nextPeriodBegins) { + lastCount = total - lastTotal; + lastTotal = total; + average = (average * n + lastCount) / (++n); + nextPeriodBegins = computeStartOfNextPeriod(now); + } + } + + public double getAverage() { + return average; + } + + public long getLastCount() { + return lastCount; + } + + abstract long computeStartOfNextPeriod(long now); + +} Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByDay.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/filter/StatsByDay.java Tue Nov 21 21:48:36 2006 @@ -0,0 +1,15 @@ +package ch.qos.logback.access.filter; + +import ch.qos.logback.core.util.TimeUtil; + +public class StatsByDay extends PeriodicStats { + + StatsByDay(long now) { + super(now); + } + @Override + long computeStartOfNextPeriod(long now) { + return TimeUtil.computeStartOfNextDay(now); + } + +} Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java Tue Nov 21 21:48:36 2006 @@ -20,6 +20,7 @@ suite.addTest(ch.qos.logback.access.net.PackageTest.suite()); suite.addTest(ch.qos.logback.access.pattern.PackageTest.suite()); suite.addTest(ch.qos.logback.access.jetty.PackageTest.suite()); + suite.addTest(ch.qos.logback.access.filter.PackageTest.suite()); return suite; } } Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/AccessStatsTest.java Tue Nov 21 21:48:36 2006 @@ -0,0 +1,84 @@ +package ch.qos.logback.access.filter; + +import junit.framework.TestCase; +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.core.util.TimeUtil; + +public class AccessStatsTest extends TestCase { + + AccessEvent accessEvent = new AccessEvent(null, null, null); + public AccessStatsTest(String arg0) { + super(arg0); + } + + protected void setUp() throws Exception { + super.setUp(); + } + + protected void tearDown() throws Exception { + super.tearDown(); + } + + public void testBasic() { + + CountingFilter cf = new CountingFilter(); + AccessStatsImpl asi = new AccessStatsImpl(cf); + asi.start(); + // Tue Nov 21 18:05:36 CET 2006 + long now = 1164128736369L; + + // test fresh start + asi.refresh(now); + assertEquals(0, asi.getLastDaysCount()); + assertEquals(0, asi.getDailyAverage(), 0.01); + + // first event + cf.decide(null); + + asi.refresh(now); + assertEquals(0, asi.getLastDaysCount()); + assertEquals(0.0, asi.getDailyAverage(), 0.01); + + long nextDay0 = TimeUtil.computeStartOfNextDay(now); + nextDay0 += 99; + + // there should be one event the next day, avg should also be 1 + asi.refresh(nextDay0); + assertEquals(1.0, asi.getLastDaysCount(), 0.01); + assertEquals(1.0, asi.getDailyAverage(), 0.01); + + cf.decide(null); // 2nd event + cf.decide(null); // 3rd event + + asi.refresh(nextDay0); + assertEquals(1, asi.getLastDaysCount()); + assertEquals(1.0, asi.getDailyAverage(), 0.01); + + long nextDay1 = TimeUtil.computeStartOfNextDay(nextDay0) + 6747; + asi.refresh(nextDay1); + assertEquals(2, asi.getLastDaysCount()); + assertEquals(1.5, asi.getDailyAverage(), 0.01); + + nextDay1 += 4444; + cf.decide(null); // 4th event + cf.decide(null); // 5th event + cf.decide(null); // 6th event + cf.decide(null); // 7th event + + asi.refresh(nextDay1); + // values should remain unchanged + assertEquals(2, asi.getLastDaysCount()); + assertEquals(1.5, asi.getDailyAverage(), 0.01); + + + long nextDay2 = TimeUtil.computeStartOfNextDay(nextDay1) + 11177; + + asi.refresh(nextDay2); + // values should remain unchanged + assertEquals(4, asi.getLastDaysCount()); + assertEquals(7.0/3, asi.getDailyAverage(), 0.01); + + + + } +} Added: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/filter/PackageTest.java Tue Nov 21 21:48:36 2006 @@ -0,0 +1,22 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework for Java. + * + * Copyright (C) 2000-2006, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ + +package ch.qos.logback.access.filter; + +import junit.framework.*; + +public class PackageTest extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(); + suite.addTestSuite(AccessStatsTest.class); + return suite; + } +} \ No newline at end of file

1 0

[continuum] BUILD SUCCESSFUL: Logback Access Module
by John Noreplai 21 Nov '06

21 Nov '06

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Ok Previous State: Failed Started at: Tue, 21 Nov 2006 18:49:59 +0100 Finished at: Tue, 21 Nov 2006 18:50:12 +0100 Total time: 13s Build Trigger: Forced Exit code: 0 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes seb slient tests are beautiful /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 44 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 12 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.jetty.JettyBasicTest 2006-11-21 18:50:10.993::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2006-11-21 18:50:11.058::INFO: jetty-6.0.x 2006-11-21 18:50:11.186::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 21/11/2006:18:50:11 +0100 localhost 127.0.0.1 21/11/2006:18:50:11 +0100 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.358 sec Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.033 sec Running ch.qos.logback.access.net.URLEvaluatorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec Results : Tests run: 21, Failures: 0, Errors: 0, Skipped: 0 [INFO] [jar:jar] [INFO] Building jar: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.6-SNAPSHOT.jar [INFO] [install:install] [INFO] Installing /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/logback-access-0.6-SNAPSHOT.jar to /root/.m2/repository/ch/qos/logback/logback-access/0.6-SNAPSHOT/logback-access-0.6-SNAPSHOT.jar [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 11 seconds [INFO] Finished at: Tue Nov 21 18:50:12 CET 2006 [INFO] Final Memory: 12M/119M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r976 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net
by noreply.seb＠qos.ch 21 Nov '06

21 Nov '06

Author: seb Date: Tue Nov 21 18:48:35 2006 New Revision: 976 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java Log: slient tests are beautiful Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java Tue Nov 21 18:48:35 2006 @@ -42,14 +42,12 @@ public void testExpectFalse() throws EvaluationException { request.setRequestUri("test"); AccessEvent ae = new AccessEvent(request, response, serverAdapter); - System.out.println(ae.getRequestURL()); assertFalse(evaluator.evaluate(ae)); } public void testExpectTrue() throws EvaluationException { request.setRequestUri(expectedURL1); AccessEvent ae = new AccessEvent(request, response, serverAdapter); - System.out.println(ae.getRequestURL()); assertTrue(evaluator.evaluate(ae)); } @@ -57,7 +55,6 @@ evaluator.addURL(expectedURL2); request.setRequestUri(expectedURL2); AccessEvent ae = new AccessEvent(request, response, serverAdapter); - System.out.println(ae.getRequestURL()); assertTrue(evaluator.evaluate(ae)); } }

1 0

[continuum] BUILD FAILURE: Logback Access Module
by John Noreplai 21 Nov '06

21 Nov '06

Online report : http://localhost:8090/continuum/servlet/continuum/target/ProjectBuild.vm/vi… Build statistics: State: Failed Previous State: Ok Started at: Tue, 21 Nov 2006 18:40:31 +0100 Finished at: Tue, 21 Nov 2006 18:40:39 +0100 Total time: 8s Build Trigger: Schedule Exit code: 1 Building machine hostname: pixie Operating system : Linux(unknown) Java version : 1.5.0_08(Sun Microsystems Inc.) Changes seb Renamed DefaultSMTPEvaluator to URLEvaluator Updated test case Minor javadoc modifications to TimeBasedRollingTest /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java (from /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java:974) /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java (from /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java:974) /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java /logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Logback Access Module [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] Deleting directory /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [resources:resources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:compile] Compiling 44 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/classes [INFO] [resources:testResources] [INFO] Using default encoding to copy filtered resources. [INFO] [compiler:testCompile] Compiling 12 source files to /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/test-classes [INFO] [surefire:test] [INFO] Surefire report directory: /opt/continuum-1.0.3/apps/continuum/working-directory/47/target/surefire-reports ------------------------------------------------------- T E S T S ------------------------------------------------------- Running ch.qos.logback.access.jetty.JettyBasicTest 2006-11-21 18:40:38.447::INFO: Logging to STDERR via org.mortbay.log.StdErrLog 2006-11-21 18:40:38.504::INFO: jetty-6.0.x 2006-11-21 18:40:38.569::INFO: Started SelectChannelConnector @ 0.0.0.0:1234 21/11/2006:18:40:38 +0100 localhost 127.0.0.1 21/11/2006:18:40:38 +0100 localhost 127.0.0.1 Tests run: 2, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 1.322 sec <<< FAILURE! Running ch.qos.logback.access.pattern.ConverterTest Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.037 sec Running ch.qos.logback.access.net.URLEvaluatorTest testMethod test testProtocol testMethod testUrl1 testProtocol testMethod testUrl2 testProtocol Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec Results : Tests run: 21, Failures: 0, Errors: 1, Skipped: 0 [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] There are test failures. [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 7 seconds [INFO] Finished at: Tue Nov 21 18:40:39 CET 2006 [INFO] Final Memory: 11M/119M [INFO] ------------------------------------------------------------------------ ****************************************************************************

1 0

svn commit: r975 - in logback/trunk: logback-access/src/main/java/ch/qos/logback/access/net logback-access/src/test/java/ch/qos/logback/access logback-access/src/test/java/ch/qos/logback/access/net logback-access/src/test/java/ch/qos/logback/access/pattern/helpers logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.seb＠qos.ch 21 Nov '06

21 Nov '06

Author: seb Date: Tue Nov 21 18:26:31 2006 New Revision: 975 Added: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java - copied, changed from r974, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java - copied, changed from r974, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java Removed: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Log: Renamed DefaultSMTPEvaluator to URLEvaluator Updated test case Minor javadoc modifications to TimeBasedRollingTest Copied: logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java (from r974, /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java) ============================================================================== --- /logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/DefaultSMTPEvaluator.java (original) +++ logback/trunk/logback-access/src/main/java/ch/qos/logback/access/net/URLEvaluator.java Tue Nov 21 18:26:31 2006 @@ -1,21 +1,59 @@ package ch.qos.logback.access.net; -import ch.qos.logback.access.boolex.JaninoEventEvaluator; +import java.util.ArrayList; +import java.util.List; -public class DefaultSMTPEvaluator extends JaninoEventEvaluator { - - private String url; - - public DefaultSMTPEvaluator() { - } - - public void setUrl(String url) { - this.url = url; +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.core.boolex.EvaluationException; +import ch.qos.logback.core.boolex.EventEvaluator; +import ch.qos.logback.core.spi.ContextAwareBase; +import ch.qos.logback.core.spi.LifeCycle; + +public class URLEvaluator extends ContextAwareBase implements EventEvaluator, LifeCycle { + + boolean started; + String name; + private List<String> URLList = new ArrayList<String>(); + + public URLEvaluator() { + } + + public void addURL(String url) { + URLList.add(url); } - - @Override + public void start() { - setExpression("request.getRequestURL().toString().contains(\"" + url + "\")"); - super.start(); + if (URLList.size() == 0) { + addWarn("No URL was given to URLEvaluator"); + } else { + started = true; + } + } + + public boolean evaluate(Object eventObject) throws NullPointerException, EvaluationException { + AccessEvent event = (AccessEvent)eventObject; + String url = event.getRequestURL(); + for(String expected:URLList) { + if (url.contains(expected)) { + return true; + } + } + return false; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public boolean isStarted() { + return started; + } + + public void stop() { + started = false; } } Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/AllTest.java Tue Nov 21 18:26:31 2006 @@ -17,7 +17,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); - + suite.addTest(ch.qos.logback.access.net.PackageTest.suite()); suite.addTest(ch.qos.logback.access.pattern.PackageTest.suite()); suite.addTest(ch.qos.logback.access.jetty.PackageTest.suite()); return suite; Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/PackageTest.java Tue Nov 21 18:26:31 2006 @@ -15,7 +15,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); - suite.addTestSuite(DefaultSMTPEvaluatorTest.class); + suite.addTestSuite(URLEvaluatorTest.class); return suite; } } \ No newline at end of file Copied: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java (from r974, /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java) ============================================================================== --- /logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/DefaultSMTPEvaluatorTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/net/URLEvaluatorTest.java Tue Nov 21 18:26:31 2006 @@ -9,19 +9,20 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.boolex.EvaluationException; -public class DefaultSMTPEvaluatorTest extends TestCase { +public class URLEvaluatorTest extends TestCase { - final String expectedURL = "testUrl"; + final String expectedURL1 = "testUrl1"; + final String expectedURL2 = "testUrl2"; Context context = new ContextBase(); - DefaultSMTPEvaluator evaluator; + URLEvaluator evaluator; DummyRequest request; DummyResponse response; DummyServerAdapter serverAdapter; public void setUp() throws Exception { - evaluator = new DefaultSMTPEvaluator(); + evaluator = new URLEvaluator(); evaluator.setContext(context); - evaluator.setUrl(expectedURL); + evaluator.addURL(expectedURL1); evaluator.start(); request = new DummyRequest(); response = new DummyResponse(); @@ -38,15 +39,25 @@ context = null; } - public void testExpectFalseBecauseOfStatus() throws EvaluationException { - request.setRequestUrl("test"); + public void testExpectFalse() throws EvaluationException { + request.setRequestUri("test"); AccessEvent ae = new AccessEvent(request, response, serverAdapter); + System.out.println(ae.getRequestURL()); assertFalse(evaluator.evaluate(ae)); } public void testExpectTrue() throws EvaluationException { - request.setRequestUrl(expectedURL); + request.setRequestUri(expectedURL1); AccessEvent ae = new AccessEvent(request, response, serverAdapter); + System.out.println(ae.getRequestURL()); + assertTrue(evaluator.evaluate(ae)); + } + + public void testExpectTrueMultiple() throws EvaluationException { + evaluator.addURL(expectedURL2); + request.setRequestUri(expectedURL2); + AccessEvent ae = new AccessEvent(request, response, serverAdapter); + System.out.println(ae.getRequestURL()); assertTrue(evaluator.evaluate(ae)); } } Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/pattern/helpers/DummyRequest.java Tue Nov 21 18:26:31 2006 @@ -18,7 +18,7 @@ public class DummyRequest implements HttpServletRequest { Hashtable<String, String> headerNames; - String url; + String uri; public DummyRequest() { headerNames = new Hashtable<String, String>(); @@ -80,11 +80,11 @@ } public String getRequestURI() { - return "testURI"; + return uri; } public StringBuffer getRequestURL() { - return new StringBuffer(url); + return new StringBuffer(uri); } public String getRequestedSessionId() { @@ -245,7 +245,7 @@ throws UnsupportedEncodingException { } - public void setRequestUrl(String url) { - this.url = url; + public void setRequestUri(String uri) { + this.uri = uri; } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingTest.java Tue Nov 21 18:26:31 2006 @@ -24,8 +24,8 @@ import ch.qos.logback.core.util.Constants; /** - * A rather exhaustive set of tests. Tests include leaving the ActiveFileName - * argument blank, or setting it, with and without compression, and tests with + * A rather exhaustive set of tests. Tests include leaving the file option + * blank, or setting it, with and without compression, and tests with * or without stopping/restarting the RollingFileAppender. * * The regression tests log a few times using a RollingFileAppender. Then, they @@ -33,7 +33,7 @@ * with witness files. * * <pre> - * Compression ActiveFileName Stop/Restart + * Compression file option Stop/Restart * Test1 NO BLANK NO * Test2 NO BLANK YES * Test3 YES BLANK NO @@ -79,7 +79,7 @@ } /** - * Test rolling without compression, activeFileName left blank, no stop/start + * Test rolling without compression, file option left blank, no stop/start */ public void test1() throws Exception { @@ -127,7 +127,7 @@ } /** - * No compression, with stop/restart, activeFileName left blank + * No compression, with stop/restart, file option left blank */ public void test2() throws Exception { RollingFileAppender rfa1 = new RollingFileAppender(); @@ -190,7 +190,7 @@ } /** - * With compression, activeFileName left blank, no stop/restart + * With compression, file option left blank, no stop/restart */ public void test3() throws Exception { RollingFileAppender rfa = new RollingFileAppender(); @@ -242,7 +242,7 @@ } /** - * Without compression, activeFileName set, with stop/restart + * Without compression, file option set, with stop/restart */ public void test4() throws Exception { RollingFileAppender rfa1 = new RollingFileAppender(); @@ -310,7 +310,7 @@ } /** - * No compression, activeFileName set, without stop/restart + * No compression, file option set, without stop/restart */ public void test5() throws Exception { RollingFileAppender rfa = new RollingFileAppender(); @@ -357,7 +357,7 @@ } /** - * With compression, activeFileName set, no stop/restart, + * With compression, file option set, no stop/restart, */ public void test6() throws Exception { RollingFileAppender rfa = new RollingFileAppender(); @@ -412,9 +412,6 @@ public static Test suite() { TestSuite suite = new TestSuite(); - // CompressTest requires external copying - // suite.addTestSuite(CompressTest.class); - // suite.addTest(new TimeBasedRollingTest("test1")); suite.addTestSuite(TimeBasedRollingTest.class); return suite; }

1 0

svn commit: r974 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran: action spi
by noreply.ceki＠qos.ch 21 Nov '06

21 Nov '06

Author: ceki Date: Tue Nov 21 12:09:34 2006 New Revision: 974 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java Log: - Renamed InterpretationContext.addProperties as addSubstitutionProperties Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java Tue Nov 21 12:09:34 2006 @@ -24,7 +24,7 @@ public class SubstitutionPropertyAction extends PropertyAction { public void setProperties(InterpretationContext ec, Properties props) { - ec.addProperties(props); + ec.addSubstitutionProperties(props); // for(Object o: props.keySet()) { // String key = (String) o; // ec.getContext().setProperty(key, props.getProperty(key)); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java Tue Nov 21 12:09:34 2006 @@ -114,7 +114,7 @@ substitutionMap.put(key, value); } - public void addProperties(Properties props) { + public void addSubstitutionProperties(Properties props) { if (props == null) { return; }

1 0

svn commit: r973 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/joran/action main/java/ch/qos/logback/core/joran/spi main/java/ch/qos/logback/core/util test/java/ch/qos/logback/core/util
by noreply.ceki＠qos.ch 21 Nov '06

21 Nov '06

Author: ceki Date: Tue Nov 21 12:07:23 2006 New Revision: 973 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Log: - fixed problem with TimeUtilTest when run European contries where the first day of the week is Monday instead of Sunday. - Renamed InterpretationContext.addProperty as addSubstitutionProperty - Fixed bug in PropertyAction Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java Tue Nov 21 12:07:23 2006 @@ -43,7 +43,7 @@ public void begin( InterpretationContext ec, String localName, Attributes attributes) { String name = attributes.getValue(NAME_ATTRIBUTE); - String value = attributes.getValue(NAME_ATTRIBUTE); + String value = attributes.getValue(VALUE_ATTRIBUTE); String fileName = attributes.getValue(FILE_ATTRIBUTE); if ( Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/SubstitutionPropertyAction.java Tue Nov 21 12:07:23 2006 @@ -32,7 +32,7 @@ } public void setProperty(InterpretationContext ec, String key, String value) { - ec.addProperty(key, value); + ec.addSubstitutionProperty(key, value); //ec.getContext().setProperty(key, value); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java Tue Nov 21 12:07:23 2006 @@ -99,7 +99,7 @@ * Add a property to the properties of this execution context. If the property * exists already, it is overwritten. */ - public void addProperty(String key, String value) { + public void addSubstitutionProperty(String key, String value) { if (key == null || value == null) { return; } @@ -121,7 +121,7 @@ Iterator i = props.keySet().iterator(); while (i.hasNext()) { String key = (String) i.next(); - addProperty(key, props.getProperty(key)); + addSubstitutionProperty(key, props.getProperty(key)); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java Tue Nov 21 12:07:23 2006 @@ -20,14 +20,13 @@ static long computeStartOfNextWeek(long now) { Calendar cal = Calendar.getInstance(); cal.setTime(new Date(now)); - + cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek()); cal.set(Calendar.HOUR_OF_DAY, 0); cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND, 0); cal.add(Calendar.WEEK_OF_YEAR, 1); - return cal.getTime().getTime(); } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Tue Nov 21 12:07:23 2006 @@ -1,5 +1,6 @@ package ch.qos.logback.core.util; +import java.util.Calendar; import java.util.Date; import junit.framework.TestCase; @@ -33,9 +34,22 @@ // Mon Nov 20 18:05:17 CET 2006 long now = 1164042317522L; // Sun Nov 26 00:00:00 CET 2006 + long expected = 1164495600000L; + + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date(now)); + + int dayOffset = cal.getFirstDayOfWeek()-Calendar.SUNDAY; + if(dayOffset != 0) { + expected += 24L*3600*1000* (cal.getFirstDayOfWeek()-Calendar.SUNDAY); + } + long computed = TimeUtil.computeStartOfNextWeek(now); - assertEquals(expected - now, 1000*(3600*(5+24*5)+60*54+42)+478); +// System.out.println("now "+new Date(now)); +// System.out.println("computed "+new Date(computed)); +// System.out.println("expected "+new Date(expected)); + assertEquals(expected - now, 1000*(3600*(5+24*(5+dayOffset))+60*54+42)+478); assertEquals(expected, computed); } @@ -45,9 +59,6 @@ // Fri Dec 01 00:00:00 CET 2006 long expected = 1164927600000L; long computed = TimeUtil.computeStartOfNextMonth(now); - - System.out.println(computed); - System.out.println(new Date(computed)); assertEquals(expected - now, 1000*(3600*(5+24*10)+60*54+42)+478); assertEquals(expected, computed); }

1 0

svn commit: r972 - in logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran: . action
by noreply.ceki＠qos.ch 21 Nov '06

21 Nov '06

Author: ceki Date: Tue Nov 21 10:48:20 2006 New Revision: 972 Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java - copied, changed from r971, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java Removed: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Log: We speak of contexts rather than repositories Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java Tue Nov 21 10:48:20 2006 @@ -22,7 +22,7 @@ import ch.qos.logback.core.joran.action.NestedSimplePropertyIA; import ch.qos.logback.core.joran.action.NewRuleAction; import ch.qos.logback.core.joran.action.ParamAction; -import ch.qos.logback.core.joran.action.RepositoryPropertyAction; +import ch.qos.logback.core.joran.action.ContextPropertyAction; import ch.qos.logback.core.joran.action.SubstitutionPropertyAction; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.Interpreter; @@ -53,8 +53,8 @@ protected void addInstanceRules(RuleStore rs) { rs.addRule(new Pattern("configuration/substitutionProperty"), new SubstitutionPropertyAction()); - rs.addRule(new Pattern("configuration/repositoryProperty"), - new RepositoryPropertyAction()); + rs.addRule(new Pattern("configuration/contextProperty"), + new ContextPropertyAction()); rs.addRule(new Pattern("configuration/conversionRule"), new ConversionRuleAction()); Copied: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java (from r971, /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java) ============================================================================== --- /logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/RepositoryPropertyAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/ContextPropertyAction.java Tue Nov 21 10:48:20 2006 @@ -9,7 +9,7 @@ /** * @author Ceki Gulcu */ -public class RepositoryPropertyAction extends PropertyAction { +public class ContextPropertyAction extends PropertyAction { /** * Add all the properties found in the argument named 'props' to an ExecutionContext.

1 0

svn commit: r971 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/util test/java/ch/qos/logback/core/util
by noreply.ceki＠qos.ch 20 Nov '06

20 Nov '06

Author: ceki Date: Mon Nov 20 23:11:25 2006 New Revision: 971 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Log: TimeUtil can correctly compute the millis for the start of next day, next week or next month Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java Mon Nov 20 23:11:25 2006 @@ -17,27 +17,33 @@ return cal.getTime().getTime(); } -// static long computeStartOfNextWeek(long now) { -// Calendar cal = Calendar.getInstance(); -// cal.setTime(new Date(now)); -// -// cal.add(Calendar.DAY_OF_MONTH, getFirstDayOfWeek()); -// -// -// cal.set(Calendar.HOUR_OF_DAY, 0); -// cal.set(Calendar.MINUTE, 0); -// cal.set(Calendar.SECOND, 0); -// cal.set(Calendar.MILLISECOND, 0); -// -// return cal.getTime().getTime(); -// } - -// this.set(Calendar.DAY_OF_WEEK, getFirstDayOfWeek()); -// this.set(Calendar.HOUR_OF_DAY, 0); -// this.set(Calendar.MINUTE, 0); -// this.set(Calendar.SECOND, 0); -// this.set(Calendar.MILLISECOND, 0); -// this.add(Calendar.WEEK_OF_YEAR, 1); + static long computeStartOfNextWeek(long now) { + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date(now)); + + cal.set(Calendar.DAY_OF_WEEK, cal.getFirstDayOfWeek()); + cal.set(Calendar.HOUR_OF_DAY, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + cal.add(Calendar.WEEK_OF_YEAR, 1); + + return cal.getTime().getTime(); + } + + static long computeStartOfNextMonth(long now) { + Calendar cal = Calendar.getInstance(); + cal.setTime(new Date(now)); + cal.set(Calendar.DATE, 1); + cal.set(Calendar.HOUR_OF_DAY, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); + cal.set(Calendar.MILLISECOND, 0); + cal.add(Calendar.MONTH, 1); + return cal.getTime().getTime(); + } + + } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/TimeUtilTest.java Mon Nov 20 23:11:25 2006 @@ -1,5 +1,7 @@ package ch.qos.logback.core.util; +import java.util.Date; + import junit.framework.TestCase; public class TimeUtilTest extends TestCase { @@ -26,4 +28,29 @@ assertEquals(expected - now, 1000*(3600*5+60*54+42)+478); assertEquals(expected, computed); } + + public void testWeek() { + // Mon Nov 20 18:05:17 CET 2006 + long now = 1164042317522L; + // Sun Nov 26 00:00:00 CET 2006 + long expected = 1164495600000L; + long computed = TimeUtil.computeStartOfNextWeek(now); + assertEquals(expected - now, 1000*(3600*(5+24*5)+60*54+42)+478); + assertEquals(expected, computed); + } + + public void testMonth() { + // Mon Nov 20 18:05:17 CET 2006 + long now = 1164042317522L; + // Fri Dec 01 00:00:00 CET 2006 + long expected = 1164927600000L; + long computed = TimeUtil.computeStartOfNextMonth(now); + + System.out.println(computed); + System.out.println(new Date(computed)); + assertEquals(expected - now, 1000*(3600*(5+24*10)+60*54+42)+478); + assertEquals(expected, computed); + } + + }

1 0

svn commit: r970 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util
by noreply.ceki＠qos.ch 20 Nov '06

20 Nov '06

Author: ceki Date: Mon Nov 20 22:57:34 2006 New Revision: 970 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java Log: ongoing work Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/TimeUtil.java Mon Nov 20 22:57:34 2006 @@ -17,20 +17,20 @@ return cal.getTime().getTime(); } - static long computeStartOfNextWeek(long now) { - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date(now)); - - cal.add(Calendar.DAY_OF_MONTH, getFirstDayOfWeek()); - - - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND, 0); - - return cal.getTime().getTime(); - } +// static long computeStartOfNextWeek(long now) { +// Calendar cal = Calendar.getInstance(); +// cal.setTime(new Date(now)); +// +// cal.add(Calendar.DAY_OF_MONTH, getFirstDayOfWeek()); +// +// +// cal.set(Calendar.HOUR_OF_DAY, 0); +// cal.set(Calendar.MINUTE, 0); +// cal.set(Calendar.SECOND, 0); +// cal.set(Calendar.MILLISECOND, 0); +// +// return cal.getTime().getTime(); +// } // this.set(Calendar.DAY_OF_WEEK, getFirstDayOfWeek()); // this.set(Calendar.HOUR_OF_DAY, 0);

1 0