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 2015/06/12 20:46:55 UTC
[1/6] jena git commit: Reform "if" to allow breakpoints on branch.
Repository: jena
Updated Branches:
refs/heads/master 21b37d1b8 -> 98a567ec5
Reform "if" to allow breakpoints on branch.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/78df7e96
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/78df7e96
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/78df7e96
Branch: refs/heads/master
Commit: 78df7e963bbc84eaf904a6ecfbe6d5e5535b76ae
Parents: 21b37d1
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 12 19:43:35 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 12 19:43:35 2015 +0100
----------------------------------------------------------------------
.../apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/78df7e96/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java
index 881f15e..c5033a4 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFDefaultErrorHandler.java
@@ -43,17 +43,20 @@ public class RDFDefaultErrorHandler extends Object implements RDFErrorHandler {
@Override
public void warning(Exception e) {
- if (!silent) logger.warn(ParseException.formatMessage(e));
+ if (!silent)
+ logger.warn(ParseException.formatMessage(e));
}
@Override
public void error(Exception e) {
- if (!silent) logger.error(ParseException.formatMessage(e));
+ if (!silent)
+ logger.error(ParseException.formatMessage(e));
}
@Override
public void fatalError(Exception e) {
- if (!silent) logger.error(ParseException.formatMessage(e));
+ if (!silent)
+ logger.error(ParseException.formatMessage(e));
throw e instanceof RuntimeException
? (RuntimeException) e
: new JenaException( e );
[5/6] jena git commit: Fix logging - use common command setup.
Posted by an...@apache.org.
Fix logging - use common command setup.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a17b1821
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a17b1821
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a17b1821
Branch: refs/heads/master
Commit: a17b18215e474d5ed6c7f5e90b2c847b38158e02
Parents: 11ed5d2
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 12 19:45:42 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 12 19:45:42 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/jena/rdfcompare.java | 2 +-
jena-core/src/main/java/jena/rdfcopy.java | 2 +-
jena-core/src/main/java/jena/rdfparse.java | 2 +-
jena-core/src/main/java/jena/schemagen.java | 2 +-
jena-core/src/main/java/jena/version.java | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a17b1821/jena-core/src/main/java/jena/rdfcompare.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/rdfcompare.java b/jena-core/src/main/java/jena/rdfcompare.java
index 062a250..3851d44 100644
--- a/jena-core/src/main/java/jena/rdfcompare.java
+++ b/jena-core/src/main/java/jena/rdfcompare.java
@@ -46,7 +46,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class rdfcompare extends java.lang.Object {
- static { setCmdLogging("jena-log4j.properties") ; }
+ static { setCmdLogging(); }
/**
* @param args the command line arguments
http://git-wip-us.apache.org/repos/asf/jena/blob/a17b1821/jena-core/src/main/java/jena/rdfcopy.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/rdfcopy.java b/jena-core/src/main/java/jena/rdfcopy.java
index 991b03f..a998c37 100644
--- a/jena-core/src/main/java/jena/rdfcopy.java
+++ b/jena-core/src/main/java/jena/rdfcopy.java
@@ -52,7 +52,7 @@ import org.apache.jena.shared.JenaException ;
*/
public class rdfcopy extends java.lang.Object {
- static { setCmdLogging("jena-log4j.properties") ; }
+ static { setCmdLogging(); }
/**
* @param args the command line arguments
http://git-wip-us.apache.org/repos/asf/jena/blob/a17b1821/jena-core/src/main/java/jena/rdfparse.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/rdfparse.java b/jena-core/src/main/java/jena/rdfparse.java
index a875bc3..0ba1eb6 100644
--- a/jena-core/src/main/java/jena/rdfparse.java
+++ b/jena-core/src/main/java/jena/rdfparse.java
@@ -77,7 +77,7 @@ import org.apache.jena.shared.Command ;
public class rdfparse {
- static { setCmdLogging("jena-log4j.properties") ; }
+ static { setCmdLogging(); }
/** Either start an RDF/XML to NTriple converter, or run test suite.
* @param args The command-line arguments.
http://git-wip-us.apache.org/repos/asf/jena/blob/a17b1821/jena-core/src/main/java/jena/schemagen.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/schemagen.java b/jena-core/src/main/java/jena/schemagen.java
index 41b0313..7091a26 100644
--- a/jena-core/src/main/java/jena/schemagen.java
+++ b/jena-core/src/main/java/jena/schemagen.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory ;
*/
public class schemagen {
- static { setCmdLogging("jena-log4j.properties") ; }
+ static { setCmdLogging(); }
// Constants
//////////////////////////////////
http://git-wip-us.apache.org/repos/asf/jena/blob/a17b1821/jena-core/src/main/java/jena/version.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/version.java b/jena-core/src/main/java/jena/version.java
index d633812..ea47d66 100644
--- a/jena-core/src/main/java/jena/version.java
+++ b/jena-core/src/main/java/jena/version.java
@@ -30,7 +30,7 @@ import org.apache.jena.Jena ;
*/
public class version implements Jena {
- static { setCmdLogging("jena-log4j.properties") ; }
+ static { setCmdLogging(); }
/**
* Print out jena version information and exit.
[4/6] jena git commit: Consistent layout
Posted by an...@apache.org.
Consistent layout
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/11ed5d26
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/11ed5d26
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/11ed5d26
Branch: refs/heads/master
Commit: 11ed5d268fb81cf8bc351c786ba5a41b2a3c065d
Parents: 09803cf
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 12 19:45:22 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 12 19:45:22 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/logging/LogCtl.java | 42 ++++++++++----------
1 file changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/11ed5d26/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
index 9e067bc..218e0a8 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/LogCtl.java
@@ -165,26 +165,28 @@ public class LogCtl {
}
private static String log4Jsetup = StrUtils.strjoinNL
- ("## Plain output to stdout",
- "log4j.appender.jena.plain=org.apache.log4j.ConsoleAppender",
- "log4j.appender.jena.plain.target=System.out",
- "log4j.appender.jena.plain.layout=org.apache.log4j.PatternLayout",
- "log4j.appender.jena.plain.layout.ConversionPattern=%m%n"
- ,
- "## Plain output with level, to stderr",
- "log4j.appender.jena.plainlevel=org.apache.log4j.ConsoleAppender",
- "log4j.appender.jena.plainlevel.target=System.err",
- "log4j.appender.jena.plainlevel.layout=org.apache.log4j.PatternLayout",
- "log4j.appender.jena.plainlevel.layout.ConversionPattern=%-5p %m%n"
-
- , "## Everything", "log4j.rootLogger=INFO, jena.plainlevel",
- "log4j.logger.com.hp.hpl.jena=WARN",
- "log4j.logger.org.apache.jena=WARN",
- "log4j.logger.org.apache.jena.tdb.loader=INFO"
-
- , "## Parser output"
- , "log4j.additivity.org.apache.jena.riot=false"
- , "log4j.logger.org.apache.jena.riot=INFO, jena.plainlevel ") ;
+ ( "## Plain output to stdout"
+ ,"log4j.appender.jena.plain=org.apache.log4j.ConsoleAppender"
+ ,"log4j.appender.jena.plain.target=System.out"
+ ,"log4j.appender.jena.plain.layout=org.apache.log4j.PatternLayout"
+ ,"log4j.appender.jena.plain.layout.ConversionPattern=%m%n"
+
+ ,"## Plain output with level, to stderr"
+ ,"log4j.appender.jena.plainlevel=org.apache.log4j.ConsoleAppender"
+ ,"log4j.appender.jena.plainlevel.target=System.err"
+ ,"log4j.appender.jena.plainlevel.layout=org.apache.log4j.PatternLayout"
+ ,"log4j.appender.jena.plainlevel.layout.ConversionPattern=%-5p %m%n"
+
+ ,"## Everything"
+ ,"log4j.rootLogger=INFO, jena.plainlevel"
+ ,"log4j.logger.com.hp.hpl.jena=WARN"
+ ,"log4j.logger.org.apache.jena=WARN"
+ ,"log4j.logger.org.apache.jena.tdb.loader=INFO"
+
+ , "## Parser output"
+ , "log4j.additivity.org.apache.jena.riot=false"
+ , "log4j.logger.org.apache.jena.riot=INFO, jena.plainlevel"
+ ) ;
// ---- java.util.logging - because that's always present.
static String defaultProperties = StrUtils.strjoinNL
(
[2/6] jena git commit: Set logging for when running directly (e.g.
Eclipse).
Posted by an...@apache.org.
Set logging for when running directly (e.g. Eclipse).
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0a6e05af
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0a6e05af
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0a6e05af
Branch: refs/heads/master
Commit: 0a6e05af6d5b91bedace222ee945eb68b836ce66
Parents: 78df7e9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 12 19:44:11 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 12 19:44:11 2015 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/jena/test/TestPackage.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0a6e05af/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/test/TestPackage.java b/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
index 51cde58..6a09d71 100644
--- a/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
+++ b/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
@@ -18,10 +18,8 @@
package org.apache.jena.test;
-import static org.apache.jena.atlas.logging.LogCtl.setCmdLogging;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
+import junit.framework.TestCase ;
+import junit.framework.TestSuite ;
import org.apache.jena.assembler.test.TestAssemblerPackage ;
/**
@@ -33,7 +31,9 @@ import org.apache.jena.assembler.test.TestAssemblerPackage ;
public class TestPackage extends TestCase {
static {
- setCmdLogging(JenaTest.log4jFilenameTests);
+ // Running directly (e.g. Eclipse) not from the POM.
+ System.setProperty("log4j.configuration", JenaTest.log4jFilenameTests);
+
}
static public TestSuite suite() {
[3/6] jena git commit: Allow testing to suppress the deprecation
banner.
Posted by an...@apache.org.
Allow testing to suppress the deprecation banner.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/09803cf4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/09803cf4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/09803cf4
Branch: refs/heads/master
Commit: 09803cf42f8c183b8893cd5229e02da30db104dc
Parents: 0a6e05a
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 12 19:44:46 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 12 19:44:46 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/jena/rdfcat.java | 14 ++++++++++----
jena-core/src/test/java/jena/test/Test_rdfcat.java | 11 +++++++++++
2 files changed, 21 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/09803cf4/jena-core/src/main/java/jena/rdfcat.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/rdfcat.java b/jena-core/src/main/java/jena/rdfcat.java
index e80742a..f05517a 100644
--- a/jena-core/src/main/java/jena/rdfcat.java
+++ b/jena-core/src/main/java/jena/rdfcat.java
@@ -144,6 +144,8 @@ public class rdfcat
/** Action queue */
protected List<RCAction> m_actionQ = new ArrayList<>();
+ // Allow testing to run silent.
+ public static boolean suppressDeprecationBanner = false ;
// Constants
//////////////////////////////////
@@ -209,10 +211,14 @@ public class rdfcat
/* main loop */
protected void go( String[] args ) {
-
- System.err.println( "------------------------------------" );
- System.err.println( "DEPRECATED: Please use riot instead." );
- System.err.println( "------------------------------------\n" );
+
+ if ( ! suppressDeprecationBanner ) {
+ System.err.println("------------------------------------------------------------------");
+ System.err.println(" DEPRECATED: Please use 'riot' instead.");
+ System.err.println(" http://jena.apache.org/documentation/io/#command-line-tools");
+ System.err.println("------------------------------------------------------------------");
+ System.err.println() ;
+ }
// ensure we use the new RIOT parser subsystem
enableRIOTParser();
http://git-wip-us.apache.org/repos/asf/jena/blob/09803cf4/jena-core/src/test/java/jena/test/Test_rdfcat.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/jena/test/Test_rdfcat.java b/jena-core/src/test/java/jena/test/Test_rdfcat.java
index d2c42aa..1e2a589 100644
--- a/jena-core/src/test/java/jena/test/Test_rdfcat.java
+++ b/jena-core/src/test/java/jena/test/Test_rdfcat.java
@@ -29,6 +29,17 @@ import org.apache.jena.rdf.model.ModelFactory ;
@SuppressWarnings("deprecation")
public class Test_rdfcat extends TestCase
{
+ // Switch off the banner during testing.
+ @Override
+ public void setUp() {
+ jena.rdfcat.suppressDeprecationBanner = true ;
+ }
+
+ @Override
+ public void tearDown() {
+ jena.rdfcat.suppressDeprecationBanner = false ;
+ }
+
public void testAbbreviationTable()
{
assertEquals( "RDF/XML", jena.rdfcat.unabbreviate.get( "x" ) );
[6/6] jena git commit: remove blank line
Posted by an...@apache.org.
remove blank line
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/98a567ec
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/98a567ec
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/98a567ec
Branch: refs/heads/master
Commit: 98a567ec5c901eac5642245de76f9f5493046948
Parents: a17b182
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 12 19:46:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 12 19:46:10 2015 +0100
----------------------------------------------------------------------
jena-core/src/test/java/org/apache/jena/test/TestPackage.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/98a567ec/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/test/TestPackage.java b/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
index 6a09d71..6b8e973 100644
--- a/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
+++ b/jena-core/src/test/java/org/apache/jena/test/TestPackage.java
@@ -33,7 +33,6 @@ public class TestPackage extends TestCase {
static {
// Running directly (e.g. Eclipse) not from the POM.
System.setProperty("log4j.configuration", JenaTest.log4jFilenameTests);
-
}
static public TestSuite suite() {