- logback-dev - mailman3.qos.ch

svn commit: r1791 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern
by noreply.ceki＠qos.ch 03 Sep '08

03 Sep '08

Author: ceki Date: Wed Sep 3 17:23:45 2008 New Revision: 1791 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LRUCache.java Log: - Using LinkedHashMap as the underlying data structure for the LRUCache. Unfortunately, this implementations fails the Scenario unit tests. Yes, it looks like a JDK bug (very suprisingly). Commiting this version for historical (archiving) purposes. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LRUCache.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LRUCache.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LRUCache.java Wed Sep 3 17:23:45 2008 @@ -1,156 +1,45 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, 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.classic.pattern; -import java.util.HashMap; -import java.util.LinkedList; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -public class LRUCache<K, V> { - - Map<K, Entry> map = new HashMap<K, Entry>(); - Entry head; - Entry tail; - - int limit; - - LRUCache(int limit) { - if(limit < 1) { - throw new IllegalArgumentException("limit cannnot be smaller than 1"); - } - - this.limit = limit; - - head = new Entry(null, null); - tail = head; - } - - public void put(K key, V value) { - Entry entry = map.get(key); - if (entry == null) { - entry = new Entry(key, value); - map.put(key, entry); - } - moveToTail(entry); - while(map.size() > limit) { - removeHead(); - } - } - - public V get(K key) { - Entry existing = map.get(key); - if (existing == null) { - return null; - } else { - moveToTail(existing); - return existing.value; - } - } - - private void removeHead() { - //System.out.println("RemoveHead called"); - map.remove(head.key); - head = head.next; - head.prev = null; - } - - private void moveToTail(Entry e) { - rearrangePreexistingLinks(e); - rearrangeTailLinks(e); - } - - private void rearrangePreexistingLinks(Entry e) { - if (e.prev != null) { - e.prev.next = e.next; - } - if (e.next != null) { - e.next.prev = e.prev; - } - if(head == e) { - head = e.next; - } +/** + * An lru cache based on Java's LinkedHashMap. + * + * @author Ceki Gulcu + * + * @param <K> + * @param <V> + */ +public class LRUCache<K, V> extends LinkedHashMap<K, V> { + private static final long serialVersionUID = -6592964689843698200L; + + final int cacheSize; + + public LRUCache(int cacheSize) { + super((int) (cacheSize*(4.0f/3)), 0.75f, true); + if(cacheSize < 1) { + throw new IllegalArgumentException("Cache size cannnot be smaller than 1"); + } + this.cacheSize = cacheSize; } - private void rearrangeTailLinks(Entry e) { - if(head == tail) { - head = e; - } - Entry preTail = tail.prev; - if(preTail != null) { - preTail.next = e; - } - e.prev = preTail; - e.next = tail; - tail.prev = e; - } - - - public void dump() { - Entry e = head; - System.out.print("N:"); - while (e != null) { - //System.out.print(e+"->"); - System.out.print(e.key+", "); - e = e.next; - } - System.out.println(); - } - - List<K> keyList() { - List<K> result = new LinkedList<K>(); - Entry e = head; - while (e != tail) { - result.add(e.key); - e = e.next; - } - return result; + protected boolean removeEldestEntry(Map.Entry eldest) { + return (size() > cacheSize); } - // ================================================================ - private class Entry { - Entry next; - Entry prev; - K key; - V value; - - Entry(K k, V v) { - this.key = k; - this.value = v; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((key == null) ? 0 : key.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final Entry other = (Entry) obj; - if (key == null) { - if (other.key != null) - return false; - } else if (!key.equals(other.key)) - return false; - if (value == null) { - if (other.value != null) - return false; - } else if (!value.equals(other.value)) - return false; - return true; - } - - @Override - public String toString() { - return "(" + key + ", " + value + ")"; - } + List<K> keyList() { + return new ArrayList<K>(keySet()); } - }

1 0

svn commit: r1790 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/pattern main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic/pattern test/java/ch/qos/logback/classic/pattern/lru
by noreply.ceki＠qos.ch 02 Sep '08

02 Sep '08

Author: ceki Date: Tue Sep 2 18:34:48 2008 New Revision: 1790 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LRUCache.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/PackageInfo.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/LRUCacheTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/Simulator.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/UtilTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/Event.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/T_Entry.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/T_LRUCache.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/Util.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java Log: LBGENERAL-23 Extracting package information is a time consuming process. Improve performance by keeping previously found results in a cache. Added an LRUCache with accompanying test cases for this purpose. Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LRUCache.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/LRUCache.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,156 @@ +package ch.qos.logback.classic.pattern; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +public class LRUCache<K, V> { + + Map<K, Entry> map = new HashMap<K, Entry>(); + Entry head; + Entry tail; + + int limit; + + LRUCache(int limit) { + if(limit < 1) { + throw new IllegalArgumentException("limit cannnot be smaller than 1"); + } + + this.limit = limit; + + head = new Entry(null, null); + tail = head; + } + + public void put(K key, V value) { + Entry entry = map.get(key); + if (entry == null) { + entry = new Entry(key, value); + map.put(key, entry); + } + moveToTail(entry); + while(map.size() > limit) { + removeHead(); + } + } + + public V get(K key) { + Entry existing = map.get(key); + if (existing == null) { + return null; + } else { + moveToTail(existing); + return existing.value; + } + } + + private void removeHead() { + //System.out.println("RemoveHead called"); + map.remove(head.key); + head = head.next; + head.prev = null; + } + + private void moveToTail(Entry e) { + rearrangePreexistingLinks(e); + rearrangeTailLinks(e); + } + + private void rearrangePreexistingLinks(Entry e) { + if (e.prev != null) { + e.prev.next = e.next; + } + if (e.next != null) { + e.next.prev = e.prev; + } + if(head == e) { + head = e.next; + } + } + + private void rearrangeTailLinks(Entry e) { + if(head == tail) { + head = e; + } + Entry preTail = tail.prev; + if(preTail != null) { + preTail.next = e; + } + e.prev = preTail; + e.next = tail; + tail.prev = e; + } + + + public void dump() { + Entry e = head; + System.out.print("N:"); + while (e != null) { + //System.out.print(e+"->"); + System.out.print(e.key+", "); + e = e.next; + } + System.out.println(); + } + + List<K> keyList() { + List<K> result = new LinkedList<K>(); + Entry e = head; + while (e != tail) { + result.add(e.key); + e = e.next; + } + return result; + } + + // ================================================================ + private class Entry { + Entry next; + Entry prev; + K key; + V value; + + Entry(K k, V v) { + this.key = k; + this.value = v; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((key == null) ? 0 : key.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final Entry other = (Entry) obj; + if (key == null) { + if (other.key != null) + return false; + } else if (!key.equals(other.key)) + return false; + if (value == null) { + if (other.value != null) + return false; + } else if (!value.equals(other.value)) + return false; + return true; + } + + @Override + public String toString() { + return "(" + key + ", " + value + ")"; + } + } + +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/PackageInfo.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/PackageInfo.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,13 @@ +package ch.qos.logback.classic.pattern; + +public class PackageInfo { + + + String jarName; + String version; + + PackageInfo(String jarName, String version) { + this.jarName = jarName; + this.version = version; + } +} Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/Util.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/Util.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/pattern/Util.java Tue Sep 2 18:34:48 2008 @@ -1,33 +1,128 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * Copyright (C) 1999-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. + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, 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.classic.pattern; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + import org.slf4j.Marker; +/** + * + * @author James Strachan + * @author Ceki Gulcu + */ public class Util { + static Map<String, PackageInfo> cache = new HashMap<String, PackageInfo>(); + static public boolean match(Marker marker, Marker[] markerArray) { - if(markerArray == null) { + if (markerArray == null) { throw new IllegalArgumentException("markerArray should not be null"); } - - //System.out.println("event marker="+marker); - + + // System.out.println("event marker="+marker); + final int size = markerArray.length; - for(int i = 0; i < size; i++) { - //System.out.println("other:"+markerArray[i]); - - if(marker.contains(markerArray[i])) { + for (int i = 0; i < size; i++) { + // System.out.println("other:"+markerArray[i]); + + if (marker.contains(markerArray[i])) { return true; } } return false; } + + static String getVersion(String className) { + String packageName = getPackageName(className); + Package aPackage = Package.getPackage(packageName); + if (aPackage != null) { + String v = aPackage.getImplementationVersion(); + if (v == null) { + return "na"; + } else { + return v; + } + } + return "na"; + } + + static public PackageInfo getPackageInfo(String className) { + PackageInfo pi = cache.get(className); + if(pi != null) { + return pi; + } + String version = getVersion(className); + String jarname = getJarNameOfClass(className); + pi = new PackageInfo(jarname, version); + //cache.put(className, pi); + return pi; + } + + static String getPackageName(String className) { + int j = className.lastIndexOf('.'); + return className.substring(0, j); + } + + /** + * Uses the context class path or the current global class loader to deduce + * the file that the given class name comes from + */ + static String getJarNameOfClass(String className) { + try { + Class type = findClass(className); + if (type != null) { + URL resource = type.getClassLoader().getResource( + type.getName().replace('.', '/') + ".class"); + // "jar:file:/C:/java/../repo/groupId/artifact/1.3/artifact-1.3.jar!/com/some/package/Some.class + if (resource != null) { + String text = resource.toString(); + int idx = text.lastIndexOf('!'); + if (idx > 0) { + text = text.substring(0, idx); + // now lets remove all but the file name + idx = text.lastIndexOf('/'); + if (idx > 0) { + text = text.substring(idx + 1); + } + idx = text.lastIndexOf('\\'); + if (idx > 0) { + text = text.substring(idx + 1); + } + return text; + } + } + } + } catch (Exception e) { + // ignore + } + return "na"; + } + + static private Class findClass(String className) { + try { + return Thread.currentThread().getContextClassLoader() + .loadClass(className); + } catch (ClassNotFoundException e) { + try { + return Class.forName(className); + } catch (ClassNotFoundException e1) { + try { + return Util.class.getClassLoader().loadClass(className); + } catch (ClassNotFoundException e2) { + return null; + } + } + } + } + } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableInformation.java Tue Sep 2 18:34:48 2008 @@ -29,7 +29,7 @@ } /** - * The string representation of the exceptopn (throwable) that this object + * The string representation of the throwable that this object * represents. */ public String[] getThrowableStrRep() { Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/LRUCacheTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/LRUCacheTest.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,71 @@ +package ch.qos.logback.classic.pattern; + +import static org.junit.Assert.assertEquals; + +import java.util.LinkedList; +import java.util.List; + +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import ch.qos.logback.classic.pattern.lru.Event; +import ch.qos.logback.classic.pattern.lru.T_LRUCache; + +public class LRUCacheTest { + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + + } + + @Test + public void smoke() { + LRUCache<String, String> cache = new LRUCache<String, String>(2); + cache.put("a", "a"); + cache.put("b", "b"); + cache.put("c", "c"); + List<String> witness = new LinkedList<String>(); + witness.add("b"); + witness.add("c"); + assertEquals(witness, cache.keyList()); + } + + @Test + public void typicalScenarioTest() { + int simulationLen = 1000 * 20; + int cacheSize = 500; + int worldSize = 10000; + doScenario(simulationLen, cacheSize, worldSize); + } + + @Test + public void scenarioCoverageTest() { + int simulationLen = 1000 * 20; + int[] cacheSizes = new int[] {1,5,10,100,1000,5000,10000}; + int[] worldSizes = new int[] {1,10,100,1000,20000}; + for (int i = 0; i < cacheSizes.length; i++) { + for (int j = 0; j < worldSizes.length; j++) { + System.out.println("cacheSize="+cacheSizes[i]+", worldSize="+worldSizes[j]); + doScenario(simulationLen, cacheSizes[i], worldSizes[j]); + } + } + } + + void doScenario(int simulationLen, int chacheSize, int worldSize) { + int cacheSize = 500; + int get2PutRatio = 10; + + Simulator simulator = new Simulator(worldSize, get2PutRatio); + List<Event> scenario = simulator.generateScenario(simulationLen); + LRUCache<String, String> lruCache = new LRUCache<String, String>(cacheSize); + T_LRUCache<String> tlruCache = new T_LRUCache<String>(cacheSize); + simulator.simulate(scenario, lruCache, tlruCache); + assertEquals(tlruCache.ketList(), lruCache.keyList()); + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/Simulator.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/Simulator.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,70 @@ +package ch.qos.logback.classic.pattern; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import ch.qos.logback.classic.pattern.lru.Event; +import ch.qos.logback.classic.pattern.lru.T_LRUCache; + +public class Simulator { + + + Random random; + + int worldSize; + int get2PutRatio; + + public Simulator(int worldSize, int get2PutRatio) { + this.worldSize = worldSize; + this.get2PutRatio = get2PutRatio; + long seed = System.nanoTime(); + System.out.println("seed is "+seed); + random = new Random(seed); + } + + public List<Event> generateScenario(int len) { + List<Event> scenario = new ArrayList<Event>(); + + for(int i = 0; i < len; i++) { + + int r = random.nextInt(get2PutRatio); + boolean put = false; + if(r == 0) { + put = true; + } + r = random.nextInt(worldSize); + Event<String> e = new Event<String>(put, String.valueOf(r)); + scenario.add(e); + } + return scenario; + } + + public void simulate(List<Event> scenario, LRUCache<String, String> lruCache, T_LRUCache<String> tlruCache) { + for(Event<String> e: scenario) { + if(e.put) { + lruCache.put(e.k, e.k); + tlruCache.put(e.k); + } else { + String r0 = lruCache.get(e.k); + String r1 = tlruCache.get(e.k); + if(r0 != null) { + assertEquals(r0, e.k); + } + assertEquals(r0, r1); + } + } + } + +// void compareAndDumpIfDifferent(LRUCache<String, String> lruCache, T_LRUCache<String> tlruCache) { +// lruCache.dump(); +// tlruCache.dump(); +// if(!lruCache.keyList().equals(tlruCache.ketList())) { +// lruCache.dump(); +// tlruCache.dump(); +// throw new AssertionFailedError("s"); +// } +// } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/UtilTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/UtilTest.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,84 @@ +package ch.qos.logback.classic.pattern; + +import java.util.Random; + +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.ServerSetup; + +public class UtilTest { + + int diff = 1024 + new Random().nextInt(10000); + + @Before + public void setUp() throws Exception { + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void withGreenMail() { + try { + ServerSetup serverSetup = new ServerSetup(-1, "localhost", + ServerSetup.PROTOCOL_SMTP); + GreenMail greenMail = new GreenMail((ServerSetup) null); + // greenMail.start(); + } catch (Throwable e) { + // e.printStackTrace(); + StackTraceElement[] stea = e.getStackTrace(); + for (StackTraceElement ste : stea) { + String className = ste.getClassName(); + PackageInfo pi = Util.getPackageInfo(className); + System.out.println(" at " + className + "." + ste.getMethodName() + + "(" + ste.getFileName() + ":" + ste.getLineNumber() + ") [" + + pi.jarName + ":" + pi.version + "]"); + } + } + } + + public void doPerf(boolean versionExtraction) { + try { + ServerSetup serverSetup = new ServerSetup(-1, "localhost", + ServerSetup.PROTOCOL_SMTP); + GreenMail greenMail = new GreenMail((ServerSetup) null); + // greenMail.start(); + } catch (Throwable e) { + StackTraceElement[] stea = e.getStackTrace(); + if (versionExtraction) { + for (StackTraceElement ste : stea) { + String className = ste.getClassName(); + PackageInfo pi = Util.getPackageInfo(className); + } + } + } + } + + double loop(int len, boolean ve) { + long start = System.nanoTime(); + for (int i = 0; i < len; i++) { + doPerf(ve); + } + return (1.0*System.nanoTime() - start)/len/1000; + } + + @Test + @Ignore + public void perfTest() { + int len = 1000; + loop(len, false); + double d0 = loop(len, false); + + System.out.println("false " + d0); + + loop(len, true); + double d1 = loop(len, true); + + System.out.println("false " + d1); + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/Event.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/Event.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,20 @@ +package ch.qos.logback.classic.pattern.lru; + +public class Event<K> { + + final public boolean put; + final public K k; + + public Event(boolean put, K k) { + this.put = put; + this.k = k; + } + + public String toString() { + if(put) { + return "Event: put, "+k; + } else { + return "Event: get, "+k; + } + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/T_Entry.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/T_Entry.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,32 @@ +package ch.qos.logback.classic.pattern.lru; + +public class T_Entry<K> implements Comparable { + + K k; + long sequenceNumber; + + T_Entry(K k, long sn) { + this.k = k; + this.sequenceNumber = sn; + } + + public int compareTo(Object o) { + if(!(o instanceof T_Entry)) { + throw new IllegalArgumentException("arguments must be of type "+T_Entry.class); + } + + T_Entry other = (T_Entry) o; + if(sequenceNumber > other.sequenceNumber) { + return 1; + } + if(sequenceNumber == other.sequenceNumber) { + return 0; + } + return -1; + } + @Override + public String toString() { + return "("+k+","+sequenceNumber+")"; + //return "("+k+")"; + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/T_LRUCache.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/pattern/lru/T_LRUCache.java Tue Sep 2 18:34:48 2008 @@ -0,0 +1,88 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, 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.classic.pattern.lru; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +/** + * This is an alternative (slower) implementation of LRUCache for testing + * purposes. + * + * @author Ceki Gulcu + */ +public class T_LRUCache<K> { + + int sequenceNumber; + final int cacheSize; + List<T_Entry<K>> cacheList = new LinkedList<T_Entry<K>>(); + + public T_LRUCache(int size) { + this.cacheSize = size; + } + + @SuppressWarnings("unchecked") + public void put(K k) { + sequenceNumber++; + T_Entry<K> te = getEntry(k); + if (te != null) { + te.sequenceNumber = sequenceNumber; + } else { + te = new T_Entry<K>(k, sequenceNumber); + cacheList.add(te); + } + Collections.sort(cacheList); + while(cacheList.size() > cacheSize) { + cacheList.remove(0); + } + } + + @SuppressWarnings("unchecked") + public K get(K k) { + T_Entry<K> te = getEntry(k); + if (te == null) { + return null; + } else { + te.sequenceNumber = ++sequenceNumber; + Collections.sort(cacheList); + return te.k; + } + } + + public List<K> ketList() { + List<K> keyList = new ArrayList<K>(); + for (T_Entry<K> e : cacheList) { + keyList.add(e.k); + } + return keyList; + } + + private T_Entry<K> getEntry(K k) { + for (int i = 0; i < cacheList.size(); i++) { + T_Entry<K> te = cacheList.get(i); + if (te.k.equals(k)) { + return te; + } + } + return null; + } + + public void dump() { + System.out.print("T:"); + for (T_Entry<K> te : cacheList) { + //System.out.print(te.toString()+"->"); + System.out.print(te.k+", "); + } + System.out.println(); + } + +}

1 0

svn commit: r1789 - logback/trunk/logback-examples/lib
by noreply.ceki＠qos.ch 01 Sep '08

01 Sep '08

Author: ceki Date: Mon Sep 1 17:33:46 2008 New Revision: 1789 Modified: logback/trunk/logback-examples/lib/ (props changed) Log: ignore snapshot version

1 0

svn commit: r1788 - logback/trunk/logback-examples/lib
by noreply.ceki＠qos.ch 01 Sep '08

01 Sep '08

Author: ceki Date: Mon Sep 1 17:33:03 2008 New Revision: 1788 Removed: logback/trunk/logback-examples/lib/slf4j-api-1.4.3.jar Log: - delete old slf4j version

1 0

Reverted logback license back to LGPL
by Ceki Gulcu 31 Aug '08

31 Aug '08

Hello all, I have reverted the logback license from GPL+classpath exception to the original LGPL. Given that GPL+classpath exception proved as controversial as the original LGPL, there is no point in changing for more of the same. Note that the previous license (GPL+classpath) was introduced in SVN on April the 8th, 2008 and was marked as tentative. Moreover, GPL+classpath was never used in a logback distribution. Just cleaning up... -- Ceki Gülcü

5 14

[JIRA] Created: (LBCLASSIC-68) logback.xml not found when running under Ant task
by Gili (JIRA) 29 Aug '08

29 Aug '08

logback.xml not found when running under Ant task ------------------------------------------------- Key: LBCLASSIC-68 URL: http://jira.qos.ch/browse/LBCLASSIC-68 Project: logback-classic Issue Type: Bug Components: Other Affects Versions: 0.9.9 Environment: Ant 1.7.1 Reporter: Gili Assignee: Logback dev list Logback uses the thread context ClassLoader to look up logback.xml but the Ant uses a custom ClassLoader that does not have the task JAR in its classpath, as a result logback.xml is never found. That is, getClass().getClassLoader().getResource("logback.xml") works Thread.currentThread().getContextClassLoader().getResource("logback.xml") does not. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 1

svn commit: r1787 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/jmx logback-classic/src/main/java/ch/qos/logback/classic/selector logback-classic/src/main/java/ch/qos/logback/classic/util logback-core/src/main/java/ch/qos/logback/core/joran/action logback-core/src/main/java/ch/qos/logback/core/util logback-examples/src/main/java/chapter7 logback-site/src/site/pages/manual logback-site/src/site/resources/manual/images/chapter4
by noreply.ceki＠qos.ch 29 Aug '08

29 Aug '08

Author: ceki Date: Fri Aug 29 15:40:43 2008 New Revision: 1787 Added: logback/trunk/logback-site/src/site/resources/manual/images/chapter4/smtpAppender1.jpg (contents, props changed) Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java logback/trunk/logback-site/src/site/pages/manual/appenders.html logback/trunk/logback-site/src/site/pages/manual/layouts.html Log: LBCLASSIC-68 The c.q.l.core.util.Loader class is used to load classes or locate resources. Previously, the TCCL (Thread Context Class Loader) was used to locate resources, in particular configuration files. However, the TCCL is not set in all environments. Instead of using the TCL use now use the class loader that loaded the Loader class itself to load resources. Now, under many circumstances TCCL==self classloader so most users will not see a difference. The situation where TCCL != self cl can occur under relatively complicated scenarios. Thus, this commit simplifies the code without hopefully affecting existing deployments. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/jmx/Configurator.java Fri Aug 29 15:40:43 2008 @@ -49,7 +49,7 @@ addInfo("Shutting down context: " + lc.getName()); lc.shutdownAndReset(); try { - new ContextInitializer(lc).autoConfig(lc.getClass().getClassLoader()); + new ContextInitializer(lc).autoConfig(); addInfo("Context: " + lc.getName() + " reloaded."); } catch(JoranException je) { addError("Reloading of context: " + lc.getName() + " failed.", je); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/selector/ContextJNDISelector.java Fri Aug 29 15:40:43 2008 @@ -115,7 +115,7 @@ private void configureLoggerContextByResource(LoggerContext context, String configFilePath) { - URL url = Loader.getResourceByTCL(configFilePath); + URL url = Loader.getResourceBySelfClassLoader(configFilePath); if (url != null) { try { JoranConfigurator configurator = new JoranConfigurator(); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Fri Aug 29 15:40:43 2008 @@ -43,7 +43,7 @@ configurator.doConfigure(url); } - private URL findConfigFileURLFromSystemProperties(ClassLoader classLoader) { + private URL findConfigFileURLFromSystemProperties() { String logbackConfigFile = System.getProperty(CONFIG_FILE_PROPERTY, null); if (logbackConfigFile != null) { URL result = null; @@ -53,7 +53,7 @@ } catch (MalformedURLException e) { // so, resource is not a URL: // attempt to get the resource from the class path - result = Loader.getResource(logbackConfigFile, classLoader); + result = Loader.getResourceBySelfClassLoader(logbackConfigFile); if (result != null) { return result; } @@ -72,16 +72,16 @@ return null; } - public void autoConfig(ClassLoader classLoader) throws JoranException { + public void autoConfig() throws JoranException { StatusListenerConfigHelper.installIfAsked(loggerContext); - URL url = findConfigFileURLFromSystemProperties(classLoader); + URL url = findConfigFileURLFromSystemProperties(); if (url == null) { - url = Loader.getResource(TEST_AUTOCONFIG_FILE, classLoader); + url = Loader.getResourceBySelfClassLoader(TEST_AUTOCONFIG_FILE); statusOnResourceSearch(TEST_AUTOCONFIG_FILE, url); } if (url == null) { - url = Loader.getResource(AUTOCONFIG_FILE, classLoader); + url = Loader.getResourceBySelfClassLoader(AUTOCONFIG_FILE); statusOnResourceSearch(AUTOCONFIG_FILE, url); } if (url != null) { @@ -91,11 +91,6 @@ } } - public void autoConfig() throws JoranException { - ClassLoader tccl = Loader.getTCL(); - autoConfig(tccl); - } - private void statusOnResourceSearch(String resourceName, URL url) { StatusManager sm = loggerContext.getStatusManager(); if (url == null) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java Fri Aug 29 15:40:43 2008 @@ -130,7 +130,7 @@ } private InputStream getInputStreamByResource(String resourceAttribute) { - URL url = Loader.getResourceByTCL(resourceAttribute); + URL url = Loader.getResourceBySelfClassLoader(resourceAttribute); if (url == null) { String errMsg = "Could not find resource corresponding to [" + resourceAttribute + "]"; Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/Loader.java Fri Aug 29 15:40:43 2008 @@ -23,41 +23,24 @@ private static boolean ignoreTCL = false; public static final String IGNORE_TCL_PROPERTY_NAME = "logback.ignoreTCL"; - + static { - String ignoreTCLProp = OptionHelper.getSystemProperty(IGNORE_TCL_PROPERTY_NAME, - null); + String ignoreTCLProp = OptionHelper.getSystemProperty( + IGNORE_TCL_PROPERTY_NAME, null); if (ignoreTCLProp != null) { ignoreTCL = OptionHelper.toBoolean(ignoreTCLProp, true); } } - /** - * This method will search for <code>resource</code> in different places. - * The search order is as follows: - * - * <ol> - * - * - * <li>Search for <code>resource</code> using the thread context class - * loader under Java2. This step is performed only if the <code> - skipTCL</code> - * parameter is false.</li> + * Search for a resource using the classloader passed as parameter. * - * - * <li>If the above step fails, search for <code>resource</code> using the - * class loader that loaded this class (<code>Loader</code>).</li> - * - * - * <li>Try one last time with - * <code>ClassLoader.getSystemResource(resource)</code>, that is is using - * the system class loader in JDK 1.2 and virtual machine's built-in class - * loader in JDK 1.1. - * - * </ol> + * @param resource + * the resource name to look for + * @param classLoader + * the classloader used for the search */ public static URL getResource(String resource, ClassLoader classLoader) { try { @@ -67,10 +50,21 @@ } } - public static URL getResourceByTCL(String resource) { - return getResource(resource, getTCL()); + /** + * Attempt to find a resource by using the classloader that loaded this class, + * namely Loader.class. + * + * @param resource + * @return + */ + public static URL getResourceBySelfClassLoader(String resource) { + return getResource(resource, Loader.class.getClassLoader()); } - + +// private static URL getResourceByTCL(String resource) { +// return getResource(resource, getTCL()); +// } + /** * Get the Thread Context Loader which is a JDK 1.2 feature. If we are running * under JDK 1.1 or anything else goes wrong the method returns @@ -81,11 +75,13 @@ return Thread.currentThread().getContextClassLoader(); } - @SuppressWarnings("unchecked") - public static Class loadClass(String clazz, Context context) throws ClassNotFoundException { + @SuppressWarnings("unchecked") + public static Class loadClass(String clazz, Context context) + throws ClassNotFoundException { ClassLoader cl = context.getClass().getClassLoader(); return cl.loadClass(clazz); } + /** * If running under JDK 1.2 load the specified class using the * <code>Thread</code> <code>contextClassLoader</code> if that fails try Modified: logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java ============================================================================== --- logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java (original) +++ logback/trunk/logback-examples/src/main/java/chapter7/SimpleMDC.java Fri Aug 29 15:40:43 2008 @@ -81,7 +81,7 @@ JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); lc.shutdownAndReset(); - URL url = Loader.getResourceByTCL("chapter7/simpleMDC.xml"); + URL url = Loader.getResourceBySelfClassLoader("chapter7/simpleMDC.xml"); configurator.doConfigure(url); } catch (JoranException je) { StatusPrinter.print(lc); Modified: logback/trunk/logback-site/src/site/pages/manual/appenders.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/appenders.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/appenders.html Fri Aug 29 15:40:43 2008 @@ -1885,9 +1885,9 @@ </root> </configuration></pre></div> - <a name="SMTPAppender"/> - <h3>SMTPAppender</h3> - + <h3><a name="SMTPAppender" href="#SMTPAppender">SMTPAppender</a></h3> + + The <a href="../xref/ch/qos/logback/classic/net/SMTPAppender.html"><code>SMTPAppender</code></a> accumulates logging events in a fixed-size buffer and sends them @@ -1901,59 +1901,65 @@ <table class="bodyTable"> - <tr class="a"> - <th>Option Name</th> - <th>Type</th> - <th>Description</th> - </tr> - <tr class="b"> - <td>SMTPHost</td> - <td><code>String</code></td> - <td> - The host name of the SMTP server. This parameter is mandatory. - </td> - </tr> - <tr class="a"> - <td>To</td> - <td><code>String</code></td> - <td> - The email address of the recipient. Multiple recipients can - be specified by using several <To> elements. - </td> - </tr> - <tr class="b"> - <td>From</td> - <td><code>String</code></td> - <td> - The stated originator of the email messages sent by - <code>SMTPAppender</code>. - </td> - </tr> - <tr class="a"> - <td>Subject</td> - <td><code>String</code></td> - <td> - - The subject of the email. The String can contain a <code>Pattern</code> - that <code>PatternLayout</code> uses. In that case, the subject - is created just before the transmission of the email, with information - about the last logging event that was issued. - - - For example, setting Log: %logger - %msg as the - Subject option will send an email with - the logger name and message string of the event that triggered the - email transmission. - - - By default, <code>SMTPAppender</code> will form a subject with - logger name and the message of the last logging event. - + <tr class="a"> + <th>Option Name</th> + <th>Type</th> + <th>Description</th> + </tr> + <tr> + <td>SMTPHost</td> + <td><code>String</code></td> + <td>The host name of the SMTP server. This parameter is mandatory.</td> + </tr> + + <tr class="alt"> + <td>SMTPPort</td> + <td><code>int</code></td> + <td>The port where the SMTP server is listening. Defaults to + 25.</td> + </tr> + + <tr> + <td>To</td> + <td><code>String</code></td> + <td>The email address of the recipient. Multiple recipients + can be specified by using several <To> elements.</td> + </tr> + <tr class="alt"> + <td>From</td> + <td><code>String</code></td> + <td>The stated originator of the email messages sent by + <code>SMTPAppender</code>. + </td> + </tr> + <tr> + <td>Subject</td> + <td><code>String</code></td> + <td> + The subject of the email. It can be any value accepted as + a valid conversion pattern by <a + href="layouts.html#ClassicPatternLayout">PatternLayout</a>. Layouts + will be discussed in the next chapter. + + + The outgoing email message will have a subject line + corresponding to applying the pattern on the logging event + that triggered the email message. + + + Assuming the Subject option + is set to "Log: %logger - %msg" and the triggerring event's + logger is named "com.foo.Bar", and contains the message + "Hello world", then the outgoing email will have the subject + line "Log: com.foo.Bar - Hello World". + + + By default, this option is set to "%logger{20} - %m". </td> </tr> - <tr class="b"> + <tr class="alt"> <td>BufferSize</td> - <td><code>String</code></td> + <td><code>int</code></td> <td> The BufferSize option takes a positive integer representing the maximum number of logging events to collect in a @@ -1962,7 +1968,7 @@ The default size of the cyclic buffer is 512. </td> </tr> - <tr class="a"> + <tr > <td>Evaluator</td> <td><code>String</code></td> <td> @@ -1971,17 +1977,21 @@ <code>SMTPAppender</code>'s <code>Evaluator</code> can be given by adding an attribute to the newly created element. - - More details about the use of event evaluators with <code>SMTPAppender</code> - follow further down this document. + + More details about the use of event evaluators with + <code>SMTPAppender</code> follow further down this document. - In the absence of this option, - <code>SMTPAppender</code> is assigned a default event evaluator which triggers - email transmission as a response to any event of level ERROR or higher. + + In the absence of this option, <code>SMTPAppender</code> is + assigned a default event evaluator which triggers email + transmission as a response to any event of level + ERROR or higher. - <code>EventEvaluator</code> objects are subclasses of the <code>JaninoEventEvaluatorBase</code> - which depends on Janino. See the <a href="../dependencies.html">dependencies page</a> - for more information. + + <code>EventEvaluator</code> objects are subclasses of the + <code>JaninoEventEvaluatorBase</code> which depends on + Janino. See the <a href="../dependencies.html">dependencies + page</a> for more information. </td> </tr> @@ -1990,7 +2000,7 @@ The SMTPAppender keeps only the last BufferSize logging events in its cyclic buffer, throwing away older events when its buffer becomes full. - The number of logging events delivered in any e-mail sent by + Thus, the number of logging events delivered in any e-mail sent by <code>SMTPAppender</code> is upper-bounded by BufferSize. This keeps memory requirements bounded while still delivering a reasonable amount of application @@ -2033,6 +2043,7 @@ <To>EMAIL-DESTINATION</To> <To>ANOTHER_EMAIL_DESTINATION</To>  <From>SENDER-EMAIL</From> + <Subject>TESTING: %logger{20} - %m</Subject> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%date %-5level %logger{35} - %message%n</Pattern> </layout> @@ -2044,26 +2055,29 @@ </root> </configuration></pre></div> - - Before trying out <code>chapter4.mail.Email</code> application with the above - configuration file, you must set the SMTPHost, - To and From options - to values appropriate for your environment. Once you have set the proper values, - change directory to logback-examples and execute the following command: + Before trying out <code>chapter4.mail.Email</code> application + with the above configuration file, you must set the SMTPHost, To and + From options to values appropriate for + your environment. Once you have set the correct values in the + configuration file, execute the following command: <div class="source"><pre>java chapter4.mail.EMail 300 src/main/java/chapter4/mail/mail.xml</pre></div> - - The chosen recipient should see an email message containing 300 logging events - formatted by <code>PatternLayout</code>. + The recipient you specified should receive an email message + containing 300 logging events formatted by + <code>PatternLayout</code> The figure below is the resulting email + message as shown by Mozialla Thunderbird. + + <img src="images/chapter4/smtpAppender1.jpg" alt="resulting email"/> - - In another configuration file mail2.xml, the values for the - SMTPHost, To - and From options are determined by variable - substitution. Here is the relevant part of mail2.xml. + In the next exampleconfiguration file mail2.xml, the + values for the SMTPHost, To and From + options are determined by variable substitution. Here is the + relevant part of mail2.xml. <div class="source"><pre> @@ -2075,41 +2089,66 @@ </appender> </pre></div> - - You can supply the various values on the command line: - + You can pass the required parameters on the command line: <div class="source"><pre>java -Dfrom=source(a)xyz.com -Dto=recipient(a)xyz.com -DsmtpHost=some_smtp_host src/main/java/chapter4.mail.EMail 10000 chapter4/mail/mail2.xml </pre></div> - - Be sure to replace with the correct values appropriate for your environment. + Be sure to replace with values as appropriate for your + environment. - - Given that the default size of the cyclic buffer is 512, - the recipient should see an email message containing 512 events conveniently - formatted in an HTML table. Note that this run of the <code>chapter4.mail.Email</code> - application generated 10'000 events of which only the last 512 were included in the email. - - - - By default, the <code>SMTPAppender</code> will initiate the transmission of an email - message as a response to an event of level ERROR or higher. - However, it is possible to override this default behavior by providing a custom - implementation of the <code>EventEvaluator</code> interface. - - - - The <code>SMTPAppender</code> submits each incoming event to its evaluator - by calling <code>evaluate()</code> method in order to check whether - the event should trigger an email or just be placed in the cyclic buffer. - When the evaluator gives a positive answer to its evaluation, an email is sent. - The <code>SMTPAppender</code> contains one and only one evaluator object. - This object may possess its own state. For illustrative purposes, - the <code>CounterBasedEvaluator</code> class listed next, implements an - event evaluator whereby every 1024th event triggers an email message. + Note that in this latest example, <code>PatternLayout</code> + was replaced by <code>HTMLLayout</code> which formats logs as an + HTML table. You can change the list and order of columns as well + as the CSS of the table. Please refer to <a + href="layouts.html#ClassicHTMLLayout">HTMLLayout</a> documentation + for further details. + + + Given that the default size of the cyclic buffer is 512, the + recipient should see an email message containing 512 events + conveniently formatted in an HTML table. Note that this run of the + <code>chapter4.mail.Email</code> application generated 10'000 + events of which only the last 512 were included in the outgoing + email. + + + <img src="images/chapter4/smtpAppender2.jpg" alt="2nd email"/> + + Email clients such as Mozilla Thunderbird, Eurdora or MS + Outlook, offer reasonably good CSS support for HTML email. + However, they sometimes automatically downgrade HTML to + plaintext. For example, to view HTML email in Thunderbird, the + "View→Message Body As→Original HTML" option + must be set. Yahoo!Mail's support for HTML email, in particular + its CSS support is very good. GMail on the other hand, while it + honors the basic HTML table structure, it ignores the internal-CSS + formatting. Gmail supports inline-CSS formatitng but since + inline-CSS would make the resulting output too voluminous, + <code>HTMLLayout</code> does not use inline-CSS. + + + <h3>Triggering event</h3> + + By default, the <code>SMTPAppender</code> will initiate the + transmission of an email message as a response to an event of + level ERROR or higher. However, it is possible to + override this default behavior by providing a custom + implementation of the <code>EventEvaluator</code> interface. + + + The <code>SMTPAppender</code> submits each incoming event to + its evaluator by calling <code>evaluate()</code> method in order + to check whether the event should trigger an email or just be + placed in the cyclic buffer. When the evaluator gives a positive + answer to its evaluation, an email is sent. The + <code>SMTPAppender</code> contains one and only one evaluator + object. This object may possess its own state. For illustrative + purposes, the <code>CounterBasedEvaluator</code> class listed + next, implements an event evaluator whereby every 1024th event + triggers an email message. Example 4.11: A <code>EventEvaluator</code> implementation Modified: logback/trunk/logback-site/src/site/pages/manual/layouts.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/layouts.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/layouts.html Fri Aug 29 15:40:43 2008 @@ -279,8 +279,9 @@ - <a name="ClassicPatternLayout"></a> - <h3>PatternLayout</h3> + + <h3><a name="ClassicPatternLayout" + href="#ClassicPatternLayout">PatternLayout</a></h3> Logback classic ships with a flexible layout called <a @@ -1412,9 +1413,11 @@ behaviours, such as option handling. - <a name="ClassicHTMLLayout"></a> + - <h2>Generating logs in HTML format</h2> + <h2> + <a name="ClassicHTMLLayout" href="#ClassicHTMLLayout">Generating logs in HTML format</a> + </h2> Logback provides a special <a href="../xref/ch/qos/logback/core/Layout.html"><code>Layout</code></a>, Added: logback/trunk/logback-site/src/site/resources/manual/images/chapter4/smtpAppender1.jpg ============================================================================== Binary file. No diff available.

1 0

[JIRA] Resolved: (LBGENERAL-17) logback-0.9.8 slf4j-api in the logback-examples is 1.4.0
by Ceki Gulcu (JIRA) 29 Aug '08

29 Aug '08

[ http://jira.qos.ch/browse/LBGENERAL-17?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu resolved LBGENERAL-17. --------------------------------- Fix Version/s: 0.9.10 Resolution: Fixed The pom.xml file of logback-example now automatically copies slf4j-api-${VERSION}.jar to lib/ > logback-0.9.8 slf4j-api in the logback-examples is 1.4.0 > --------------------------------------------------------- > > Key: LBGENERAL-17 > URL: http://jira.qos.ch/browse/LBGENERAL-17 > Project: logback-general > Issue Type: Bug > Components: build-structure > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Jin Xi > Assignee: Logback dev list > Priority: Blocker > Fix For: 0.9.10 > > > slf4j-api in the logback-examples is slf4j-api-1.4.0.jar > it should be slf4j-api-1.4.3.jar or the examples won't run. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

svn commit: r1786 - logback/trunk/logback-examples
by noreply.ceki＠qos.ch 28 Aug '08

28 Aug '08

Author: ceki Date: Thu Aug 28 19:04:40 2008 New Revision: 1786 Modified: logback/trunk/logback-examples/pom.xml Log: LBGENERAL-17 added a small ant script to automatically copy slf4j-api-${VERSION}.jar to lib/ Modified: logback/trunk/logback-examples/pom.xml ============================================================================== --- logback/trunk/logback-examples/pom.xml (original) +++ logback/trunk/logback-examples/pom.xml Thu Aug 28 19:04:40 2008 @@ -15,18 +15,13 @@ <name>Logback Examples Module</name> <url>http://logback.qos.ch</url> - <description> -  + <description> Logback: the generic, reliable, fast and flexible logging library for Java. </description> <licenses> <license> - <name> GNU Lesser General Public License</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> + <name> GNU Lesser General Public License</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> </license> </licenses> @@ -61,6 +56,9 @@ </dependencies> + + + <build> <resources> <resource> @@ -77,6 +75,31 @@ <target>1.5</target> </configuration> </plugin> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <configuration> + <tasks> + <property name="slf4jJAR" + value="${settings.localRepository}/org/slf4j/slf4j-api/${slf4j.version}/slf4j-api-${slf4j.version}.jar"/> + <echo>Copying ${slf4jJAR} to lib/</echo> + <delete> + <fileset dir="lib/" includes="slf4j-*SNAPSHOT.jar"/> + </delete> + <copy file="${slf4jJAR}" todir="lib/"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> </build>

1 0

svn commit: r1785 - logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 28 Aug '08

28 Aug '08

Author: ceki Date: Thu Aug 28 16:44:11 2008 New Revision: 1785 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java Log: - added a comment Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SMTPAppender.java Thu Aug 28 16:44:11 2008 @@ -31,6 +31,7 @@ */ public class SMTPAppender extends SMTPAppenderBase<LoggingEvent> { + // value "%logger{20} - %m" is referenced in the docs! static final String DEFAULT_SUBJECT_PATTERN = "%logger{20} - %m"; static final String DEFAULT_EVALUATOR_EXPRESSION = "level >= ERROR";

1 0