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 2012/06/06 12:52:03 UTC

svn commit: r1346820 - in /jena/trunk/jena-core/src/main/java/jena: RuleMap.java rdfcat.java rdfcompare.java rdfcopy.java rdfparse.java schemagen.java turtle.java version.java

Author: andy
Date: Wed Jun  6 10:52:03 2012
New Revision: 1346820

URL: http://svn.apache.org/viewvc?rev=1346820&view=rev
Log:
Ensure logging configuration set up before anything else can run.

Modified:
    jena/trunk/jena-core/src/main/java/jena/RuleMap.java
    jena/trunk/jena-core/src/main/java/jena/rdfcat.java
    jena/trunk/jena-core/src/main/java/jena/rdfcompare.java
    jena/trunk/jena-core/src/main/java/jena/rdfcopy.java
    jena/trunk/jena-core/src/main/java/jena/rdfparse.java
    jena/trunk/jena-core/src/main/java/jena/schemagen.java
    jena/trunk/jena-core/src/main/java/jena/turtle.java
    jena/trunk/jena-core/src/main/java/jena/version.java

Modified: jena/trunk/jena-core/src/main/java/jena/RuleMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/RuleMap.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/RuleMap.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/RuleMap.java Wed Jun  6 10:52:03 2012
@@ -53,6 +53,7 @@ import java.io.*;
  * @version $Revision: 1.1 $ on $Date: 2009-06-29 08:55:51 $
  */
 public class RuleMap {
+    static { setLog4jConfiguration() ; }
     
     /**
      * Load a set of rule definitions including processing of
@@ -128,10 +129,6 @@ public class RuleMap {
         }
     }
     
-    static {
-    	setLog4jConfiguration() ;
-    }
-
     /**
      * General command line utility to process one RDF file into another
      * by application of a set of forward chaining rules. 

Modified: jena/trunk/jena-core/src/main/java/jena/rdfcat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/rdfcat.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/rdfcat.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/rdfcat.java Wed Jun  6 10:52:03 2012
@@ -127,6 +127,8 @@ import jena.cmdline.*;
  */
 public class rdfcat
 {
+    static { setLog4jConfiguration() ; }
+    
     // Constants
     //////////////////////////////////
 
@@ -257,10 +259,6 @@ public class rdfcat
     // External signature methods
     //////////////////////////////////
 
-    static {
-    	setLog4jConfiguration() ;
-    }
-
     public static void main( String[] args ) {
         new rdfcat().go( args );
     }

Modified: jena/trunk/jena-core/src/main/java/jena/rdfcompare.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/rdfcompare.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/rdfcompare.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/rdfcompare.java Wed Jun  6 10:52:03 2012
@@ -49,9 +49,7 @@ import java.io.FileInputStream;
  */
 public class rdfcompare extends java.lang.Object {
 
-    static {
-    	setLog4jConfiguration() ;
-    }
+    static { setLog4jConfiguration() ; }
 
     /**
     * @param args the command line arguments

Modified: jena/trunk/jena-core/src/main/java/jena/rdfcopy.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/rdfcopy.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/rdfcopy.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/rdfcopy.java Wed Jun  6 10:52:03 2012
@@ -55,9 +55,7 @@ import java.io.*;
  */
 public class rdfcopy extends java.lang.Object {
 
-    static {
-    	setLog4jConfiguration() ;
-    }
+    static { setLog4jConfiguration() ; }
 
 	/**
 	* @param args the command line arguments

Modified: jena/trunk/jena-core/src/main/java/jena/rdfparse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/rdfparse.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/rdfparse.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/rdfparse.java Wed Jun  6 10:52:03 2012
@@ -78,9 +78,7 @@ import com.hp.hpl.jena.shared.Command;
 
 public class rdfparse {
 
-    static {
-    	setLog4jConfiguration() ;
-    }
+    static { setLog4jConfiguration() ; }
 
     /** Either start an RDF/XML to NTriple converter, or run test suite.
 	 * @param args The command-line arguments.

Modified: jena/trunk/jena-core/src/main/java/jena/schemagen.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/schemagen.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/schemagen.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/schemagen.java Wed Jun  6 10:52:03 2012
@@ -57,6 +57,9 @@ import com.hp.hpl.jena.vocabulary.*;
  * @version CVS $Id: schemagen.java,v 1.14 2011-03-22 12:37:59 ian_dickinson Exp $
  */
 public class schemagen {
+    
+    static { setLog4jConfiguration() ; }
+
     // Constants
     //////////////////////////////////
 
@@ -147,10 +150,6 @@ public class schemagen {
     // External signature methods
     //////////////////////////////////
 
-    static {
-        setLog4jConfiguration() ;
-    }
-
     /* Main entry point. See Javadoc for details of the many command line arguments */
     public static void main( String[] args ) {
         try {

Modified: jena/trunk/jena-core/src/main/java/jena/turtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/turtle.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/turtle.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/turtle.java Wed Jun  6 10:52:03 2012
@@ -35,9 +35,7 @@ import com.hp.hpl.jena.util.FileUtils;
 
 public class turtle
 {
-	static {
-    	setLog4jConfiguration() ;
-    }
+	static { setLog4jConfiguration() ; }
 	
     /** Run the Turtle parser - produce N-triples */
     public static void main(String[] args)

Modified: jena/trunk/jena-core/src/main/java/jena/version.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/jena/version.java?rev=1346820&r1=1346819&r2=1346820&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/jena/version.java (original)
+++ jena/trunk/jena-core/src/main/java/jena/version.java Wed Jun  6 10:52:03 2012
@@ -30,9 +30,7 @@ import java.lang.reflect.*;
  */
 public class version implements Jena {
 
-    static {
-    	setLog4jConfiguration() ;
-    }
+    static { setLog4jConfiguration() ; }
 
     /**
 	 * Print out jena version information and exit.