svn commit: r1551362 - in /jena/Scratch/AFS/Dev: src-dev/dev/ src-dev/opexec/ src/main/java/jenaplus/ src/main/java/projects/rdfpatch/ src/main/java/riot/io/

[andy]

Author: andy
Date: Mon Dec 16 21:34:10 2013
New Revision: 1551362

URL: http://svn.apache.org/r1551362
Log:
Sync to ARQ

Modified:
    jena/Scratch/AFS/Dev/src-dev/dev/LogMain.java
    jena/Scratch/AFS/Dev/src-dev/dev/RunAFS.java
    jena/Scratch/AFS/Dev/src-dev/opexec/OpExecutorExample.java
    jena/Scratch/AFS/Dev/src/main/java/jenaplus/TestMRSW.java
    jena/Scratch/AFS/Dev/src/main/java/projects/rdfpatch/MainRec.java
    jena/Scratch/AFS/Dev/src/main/java/riot/io/TestTokenIO.java

Modified: jena/Scratch/AFS/Dev/src-dev/dev/LogMain.java
URL: 
http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/src-dev/dev/LogMain.java?rev=1551362&r1=1551361&r2=1551362&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/src-dev/dev/LogMain.java (original)
+++ jena/Scratch/AFS/Dev/src-dev/dev/LogMain.java Mon Dec 16 21:34:10 2013
@@ -23,13 +23,13 @@ import java.io.IOException ;
 import java.io.UnsupportedEncodingException ;
 
 import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
 import org.apache.jena.atlas.logging.java.ConsoleHandlerStdout ;
 import org.slf4j.LoggerFactory ;
 
 public class LogMain
 {
-    static { Log.setLog4j() ; }
+    static { LogCtl.setLog4j() ; }
     public static void main(String ... args) //throws SecurityException, 
IOException
     {
         mainSLF4j() ;
@@ -43,7 +43,7 @@ public class LogMain
         //   log4j.properties logging
         //   DIR is one config file per host
 
-        Log.setLog4j("log4j-net.properties") ;    // Re-initialize log4j.
+        LogCtl.setLog4j("log4j-net.properties") ;    // Re-initialize log4j.
         LoggerFactory.getLogger("HELLO").info("Message") ;
         System.out.println("Exit") ;
         System.exit(0) ;

Modified: jena/Scratch/AFS/Dev/src-dev/dev/RunAFS.java
URL: 
http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/src-dev/dev/RunAFS.java?rev=1551362&r1=1551361&r2=1551362&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/src-dev/dev/RunAFS.java (original)
+++ jena/Scratch/AFS/Dev/src-dev/dev/RunAFS.java Mon Dec 16 21:34:10 2013
@@ -20,7 +20,7 @@ package dev;
 
 import java.util.Iterator ;
 
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
 import org.apache.jena.iri.IRI ;
 import org.apache.jena.iri.IRIFactory ;
 import org.apache.jena.iri.Violation ;
@@ -28,7 +28,7 @@ import org.apache.jena.iri.ViolationCode
 
 public class RunAFS
 {
-    static { Log.setLog4j() ; }
+    static { LogCtl.setLog4j() ; }
     
     public static void exit(int code)
     {

Modified: jena/Scratch/AFS/Dev/src-dev/opexec/OpExecutorExample.java
URL: 
http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/src-dev/opexec/OpExecutorExample.java?rev=1551362&r1=1551361&r2=1551362&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/src-dev/opexec/OpExecutorExample.java (original)
+++ jena/Scratch/AFS/Dev/src-dev/opexec/OpExecutorExample.java Mon Dec 16 
21:34:10 2013
@@ -21,7 +21,7 @@ package opexec ;
 import java.io.StringReader ;
 
 import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
 
 import com.hp.hpl.jena.query.* ;
 import com.hp.hpl.jena.rdf.model.Model ;
@@ -74,7 +74,7 @@ public class OpExecutorExample // extend
     }
 
     public static void main(String... argv) {
-        Log.setLog4j() ;
+        LogCtl.setLog4j() ;
         init() ;
         Model m = data() ;
 

Modified: jena/Scratch/AFS/Dev/src/main/java/jenaplus/TestMRSW.java
URL: 
http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/src/main/java/jenaplus/TestMRSW.java?rev=1551362&r1=1551361&r2=1551362&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/src/main/java/jenaplus/TestMRSW.java (original)
+++ jena/Scratch/AFS/Dev/src/main/java/jenaplus/TestMRSW.java Mon Dec 16 
21:34:10 2013
@@ -23,14 +23,14 @@ import java.util.List;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
 
 import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.shared.LockMRSW;
 
 public class TestMRSW
 {
-    static { Log.setLog4j() ; }
+    static { LogCtl.setLog4j() ; }
     
     static Lock lock = new LockMRSW() ;
     static AtomicInteger readerCount = new AtomicInteger(0) ;

Modified: jena/Scratch/AFS/Dev/src/main/java/projects/rdfpatch/MainRec.java
URL: 
http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/src/main/java/projects/rdfpatch/MainRec.java?rev=1551362&r1=1551361&r2=1551362&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/src/main/java/projects/rdfpatch/MainRec.java (original)
+++ jena/Scratch/AFS/Dev/src/main/java/projects/rdfpatch/MainRec.java Mon Dec 
16 21:34:10 2013
@@ -21,7 +21,7 @@ package projects.rdfpatch;
 import java.io.StringWriter ;
 import java.io.Writer ;
 
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
 import riot.io.TokenInputStream ;
@@ -35,7 +35,7 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
 
 public class MainRec
 {
-    static { Log.setCmdLogging() ; }
+    static { LogCtl.setCmdLogging() ; }
     
     public static void main(String[] args)
     {

Modified: jena/Scratch/AFS/Dev/src/main/java/riot/io/TestTokenIO.java
URL: 
http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/src/main/java/riot/io/TestTokenIO.java?rev=1551362&r1=1551361&r2=1551362&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/src/main/java/riot/io/TestTokenIO.java (original)
+++ jena/Scratch/AFS/Dev/src/main/java/riot/io/TestTokenIO.java Mon Dec 16 
21:34:10 2013
@@ -32,7 +32,7 @@ import org.apache.jena.atlas.io.IO ;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.Chars ;
 import org.apache.jena.atlas.lib.Sink ;
-import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.LogCtl ;
 import org.apache.jena.riot.tokens.Token ;
 import org.apache.jena.riot.tokens.TokenType ;
 import org.apache.jena.riot.tokens.Tokenizer ;
@@ -65,12 +65,12 @@ public class TestTokenIO extends BaseTes
 
     @BeforeClass public static void setupClass()
     {
-        Log.enable("Token") ;
+        LogCtl.enable("Token") ;
     }
     
     @AfterClass public static void teardownClass()
     {
-        Log.enable("Token", "warn") ;
+        LogCtl.set("Token", "warn") ;
     }