You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2011/11/05 13:30:08 UTC

svn commit: r1197946 - in /incubator/jena/Jena2/ARQ/trunk: .classpath src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java src/test/resources/ src/test/resources/log4j-testing.properties src/test/resources/log4j.properties

Author: andy
Date: Sat Nov  5 12:30:08 2011
New Revision: 1197946

URL: http://svn.apache.org/viewvc?rev=1197946&view=rev
Log:
Clean up logging during test runs.

Added:
    incubator/jena/Jena2/ARQ/trunk/src/test/resources/
    incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j-testing.properties   (with props)
    incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j.properties   (with props)
Modified:
    incubator/jena/Jena2/ARQ/trunk/.classpath
    incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java

Modified: incubator/jena/Jena2/ARQ/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/.classpath?rev=1197946&r1=1197945&r2=1197946&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/.classpath (original)
+++ incubator/jena/Jena2/ARQ/trunk/.classpath Sat Nov  5 12:30:08 2011
@@ -2,6 +2,8 @@
 <classpath>
   <classpathentry excluding="**/.svn/" kind="src" path="src/main/java"/>
   <classpathentry excluding="**/.svn/" kind="src" path="src/test/java"/>
+  <classpathentry excluding="**/.svn/" kind="src" path="src/main/resources"/>
+  <classpathentry excluding="**/.svn/" kind="src" path="src/test/resources"/>
   <classpathentry excluding="**/.svn/" kind="src" path="src-examples"/>
 
   <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1197946&r1=1197945&r2=1197946&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Sat Nov  5 12:30:08 2011
@@ -22,6 +22,7 @@ package com.hp.hpl.jena.sparql;
 import junit.framework.JUnit4TestAdapter ;
 import junit.framework.TestSuite ;
 import org.openjena.atlas.TC_Atlas ;
+import org.openjena.atlas.logging.Log ;
 import org.openjena.riot.ErrorHandlerFactory ;
 import org.openjena.riot.TC_Riot ;
 
@@ -51,7 +52,11 @@ import com.hp.hpl.jena.sparql.util.TS_Ut
  */
 
 public class ARQTestSuite extends TestSuite
-{
+{
+    // Log4j for testing.
+    public static final String log4jPropertiesFilename = "log4j-testing.properties" ;
+    static { Log.setLog4j(log4jPropertiesFilename) ; }
+    
     public static final String testDirARQ = "testing/ARQ" ;
     
     static public TestSuite suite()

Added: incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j-testing.properties
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j-testing.properties?rev=1197946&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j-testing.properties (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j-testing.properties Sat Nov  5 12:30:08 2011
@@ -0,0 +1,18 @@
+log4j.rootLogger=INFO, stdlog
+
+log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
+## log4j.appender.stdlog.target=System.err
+log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: %m%n
+
+# Execution logging
+log4j.logger.com.hp.hpl.jena.arq.info=INFO
+log4j.logger.com.hp.hpl.jena.arq.exec=INFO
+
+# Everything else in Jena
+log4j.logger.com.hp.hpl.jena=WARN
+log4j.logger.org.openjena=WARN
+log4j.logger.org.openjena.riot=INFO
+
+# Joseki server
+log4j.logger.org.joseki=INFO

Propchange: incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j-testing.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j.properties?rev=1197946&view=auto
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j.properties (added)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j.properties Sat Nov  5 12:30:08 2011
@@ -0,0 +1,18 @@
+log4j.rootLogger=INFO, stdlog
+
+log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
+## log4j.appender.stdlog.target=System.err
+log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: %m%n
+
+# Execution logging
+log4j.logger.com.hp.hpl.jena.arq.info=INFO
+log4j.logger.com.hp.hpl.jena.arq.exec=INFO
+
+# Everything else in Jena
+log4j.logger.com.hp.hpl.jena=WARN
+log4j.logger.org.openjena=WARN
+log4j.logger.org.openjena.riot=INFO
+
+# Joseki server
+log4j.logger.org.joseki=INFO

Propchange: incubator/jena/Jena2/ARQ/trunk/src/test/resources/log4j.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain