Return-Path: X-Original-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-jspwiki-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0434D10680 for ; Sun, 9 Jun 2013 12:20:12 +0000 (UTC) Received: (qmail 65554 invoked by uid 500); 9 Jun 2013 12:20:11 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 65515 invoked by uid 500); 9 Jun 2013 12:20:09 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 65493 invoked by uid 99); 9 Jun 2013 12:20:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jun 2013 12:20:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Jun 2013 12:20:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 820A223888E7; Sun, 9 Jun 2013 12:19:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1491192 - in /incubator/jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java jspwiki-war/src/main/java/org/apache/wiki/util/WikiBackgroundThread.java jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java Date: Sun, 09 Jun 2013 12:19:46 -0000 To: jspwiki-commits@incubator.apache.org From: metskem@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130609121946.820A223888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: metskem Date: Sun Jun 9 12:19:45 2013 New Revision: 1491192 URL: http://svn.apache.org/r1491192 Log: 2013-06-09 Harry Metske (metskem@apache.org) * 2.10.0-svn-9 * minor tweaks to HsqlDbUtils so we get far less debug output on builds (450k => 90k) * WikiBackgroundThread: replace "System.out.println" with log4j error/warn Modified: incubator/jspwiki/trunk/ChangeLog incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/WikiBackgroundThread.java incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java Modified: incubator/jspwiki/trunk/ChangeLog URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1491192&r1=1491191&r2=1491192&view=diff ============================================================================== --- incubator/jspwiki/trunk/ChangeLog (original) +++ incubator/jspwiki/trunk/ChangeLog Sun Jun 9 12:19:45 2013 @@ -1,3 +1,10 @@ +2013-06-09 Harry Metske (metskem@apache.org) + + * 2.10.0-svn-9 + + * minor tweaks to HsqlDbUtils so we get far less debug output on builds (450k => 90k) + * WikiBackgroundThread: replace "System.out.println" with log4j error/warn + 2013-06-07 Juan Pablo Santos (juanpablo AT apache DOT org) * 2.10.0-svn-8 Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1491192&r1=1491191&r2=1491192&view=diff ============================================================================== --- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original) +++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Sun Jun 9 12:19:45 2013 @@ -75,7 +75,7 @@ public final class Release *

* If the build identifier is empty, it is not added. */ - public static final String BUILD = "8"; + public static final String BUILD = "9"; /** * This is the generic version string you should use Modified: incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/WikiBackgroundThread.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/WikiBackgroundThread.java?rev=1491192&r1=1491191&r2=1491192&view=diff ============================================================================== --- incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/WikiBackgroundThread.java (original) +++ incubator/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/util/WikiBackgroundThread.java Sun Jun 9 12:19:45 2013 @@ -18,6 +18,7 @@ */ package org.apache.wiki.util; +import org.apache.log4j.Logger; import org.apache.wiki.InternalWikiException; import org.apache.wiki.WikiEngine; import org.apache.wiki.event.WikiEngineEvent; @@ -35,6 +36,7 @@ import org.apache.wiki.event.WikiEventLi */ public abstract class WikiBackgroundThread extends Thread implements WikiEventListener { + private static final Logger LOG = Logger.getLogger(WikiBackgroundThread.class); private volatile boolean m_killMe = false; private final WikiEngine m_engine; private final int m_interval; @@ -71,7 +73,7 @@ public abstract class WikiBackgroundThre { if ( ((WikiEngineEvent)event).getType() == WikiEngineEvent.SHUTDOWN ) { - System.out.println( "Detected wiki engine shutdown: killing " + getName() + "." ); + LOG.warn( "Detected wiki engine shutdown: killing " + getName() + "." ); m_killMe = true; } } @@ -125,7 +127,7 @@ public abstract class WikiBackgroundThre { // Perform the initial startup task final String name = getName(); - System.out.println( "Starting up background thread: " + name + "."); + LOG.warn( "Starting up background thread: " + name + "."); startupTask(); // Perform the background task; check every @@ -147,7 +149,7 @@ public abstract class WikiBackgroundThre if( m_killMe ) { interrupted = true; - System.out.println( "Interrupted background thread: " + name + "." ); + LOG.warn( "Interrupted background thread: " + name + "." ); break; } } @@ -158,8 +160,7 @@ public abstract class WikiBackgroundThre } catch( Throwable t ) { - System.err.println( "Background thread error: (stack trace follows)" ); - t.printStackTrace(); + LOG.error( "Background thread error: (stack trace follows)", t ); } } @@ -168,8 +169,7 @@ public abstract class WikiBackgroundThre } catch( Throwable t ) { - System.err.println( "Background thread error: (stack trace follows)" ); - t.printStackTrace(); + LOG.error( "Background thread error: (stack trace follows)", t ); throw new InternalWikiException( t.getMessage() ); } } Modified: incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java?rev=1491192&r1=1491191&r2=1491192&view=diff ============================================================================== --- incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java (original) +++ incubator/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/HsqlDbUtils.java Sun Jun 9 12:19:45 2013 @@ -93,6 +93,8 @@ public class HsqlDbUtils Properties hProps = loadPropertiesFrom( "target/test-classes/jdbc.properties" ); hsqlServer = new Server(); + hsqlServer.setSilent(true); // be quiet during junit tests + hsqlServer.setLogWriter(null); // and even more quiet // pre-checks hsqlServer.checkRunning( false ); // throws RuntimeException if running