Merge pull request #751 from afs/rdf-star-2 JENA-1899: RDF* (Part 2)

commit: 50504d942d9420ac2d3dc40e9c19bde91bff6560 [log] [tgz]
author: Andy Seaborne <andy@apache.org> Mon Jun 01 17:26:16 2020 +0100
committer: GitHub <noreply@github.com> Mon Jun 01 17:26:16 2020 +0100
tree: 7a6a1b264beffde881055f7f5a7ea80607444eef
parent: 0a68b9d52ee31bcd8d59109fc230158c9464aa56 [diff]
parent: eaca80f6609fff4602094060a711f72a041c6364 [diff]
diff --git a/.gitattributes b/.gitattributes
index a13140a..92beb99 100644
--- a/.gitattributes
+++ b/.gitattributes

@@ -1,3 +1,4 @@
 *.png binary
 *.jpg binary
 *.gif binary
+*.bat binary

diff --git a/apache-jena/bat/arq.bat b/apache-jena/bat/arq.bat
index d7f347f..2e7ae30 100644
--- a/apache-jena/bat/arq.bat
+++ b/apache-jena/bat/arq.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.arq %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.arq %*

 exit /B


diff --git a/apache-jena/bat/infer.bat b/apache-jena/bat/infer.bat
index acde58f..b6a9662 100644
--- a/apache-jena/bat/infer.bat
+++ b/apache-jena/bat/infer.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.infer %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.infer %*

 exit /B


diff --git a/apache-jena/bat/iri.bat b/apache-jena/bat/iri.bat
index e0663e7..6cd8983 100644
--- a/apache-jena/bat/iri.bat
+++ b/apache-jena/bat/iri.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.iri %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.iri %*

 exit /B


diff --git a/apache-jena/bat/juuid.bat b/apache-jena/bat/juuid.bat
index 432c065..cc5be2a 100644
--- a/apache-jena/bat/juuid.bat
+++ b/apache-jena/bat/juuid.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.juuid %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.juuid %*

 exit /B


diff --git a/apache-jena/bat/nquads.bat b/apache-jena/bat/nquads.bat
index 153e9b9..f1a66d1 100644
--- a/apache-jena/bat/nquads.bat
+++ b/apache-jena/bat/nquads.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.nquads %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.nquads %*

 exit /B


diff --git a/apache-jena/bat/ntriples.bat b/apache-jena/bat/ntriples.bat
index 30c8633..eaa9b42 100644
--- a/apache-jena/bat/ntriples.bat
+++ b/apache-jena/bat/ntriples.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.ntriples %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.ntriples %*

 exit /B


diff --git a/apache-jena/bat/qparse.bat b/apache-jena/bat/qparse.bat
index bab1e28..19f080b 100644
--- a/apache-jena/bat/qparse.bat
+++ b/apache-jena/bat/qparse.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.qparse %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.qparse %*

 exit /B


diff --git a/apache-jena/bat/rdfcat.bat b/apache-jena/bat/rdfcat.bat
index cd4feb9..1861b25 100644
--- a/apache-jena/bat/rdfcat.bat
+++ b/apache-jena/bat/rdfcat.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" jena.rdfcat %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" jena.rdfcat %*

 exit /B


diff --git a/apache-jena/bat/rdfcompare.bat b/apache-jena/bat/rdfcompare.bat
index d21c06a..9e28ce3 100644
--- a/apache-jena/bat/rdfcompare.bat
+++ b/apache-jena/bat/rdfcompare.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" jena.rdfcompare %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" jena.rdfcompare %*

 exit /B


diff --git a/apache-jena/bat/rdfcopy.bat b/apache-jena/bat/rdfcopy.bat
index 653b145..c9344b0 100644
--- a/apache-jena/bat/rdfcopy.bat
+++ b/apache-jena/bat/rdfcopy.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" jena.rdfcopy %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" jena.rdfcopy %*

 exit /B


diff --git a/apache-jena/bat/rdfdiff.bat b/apache-jena/bat/rdfdiff.bat
index 6ff74d2..0dcff01 100644
--- a/apache-jena/bat/rdfdiff.bat
+++ b/apache-jena/bat/rdfdiff.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.rdfdiff %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.rdfdiff %*

 exit /B


diff --git a/apache-jena/bat/rdfparse.bat b/apache-jena/bat/rdfparse.bat
index cd54d9f..43721df 100644
--- a/apache-jena/bat/rdfparse.bat
+++ b/apache-jena/bat/rdfparse.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" jena.rdfparse %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" jena.rdfparse %*

 exit /B


diff --git a/apache-jena/bat/rdfxml.bat b/apache-jena/bat/rdfxml.bat
index bf5d0fd..268b7d9 100644
--- a/apache-jena/bat/rdfxml.bat
+++ b/apache-jena/bat/rdfxml.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.rdfxml %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.rdfxml %*

 exit /B


diff --git a/apache-jena/bat/riot.bat b/apache-jena/bat/riot.bat
index 2e7d353..63f4332 100644
--- a/apache-jena/bat/riot.bat
+++ b/apache-jena/bat/riot.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.riot %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.riot %*

 exit /B


diff --git a/apache-jena/bat/rset.bat b/apache-jena/bat/rset.bat
index fd2570b..b47515a 100644
--- a/apache-jena/bat/rset.bat
+++ b/apache-jena/bat/rset.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.rset %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.rset %*

 exit /B


diff --git a/apache-jena/bat/rsparql.bat b/apache-jena/bat/rsparql.bat
index 46125d2..c359713 100644
--- a/apache-jena/bat/rsparql.bat
+++ b/apache-jena/bat/rsparql.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.rsparql %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.rsparql %*

 exit /B


diff --git a/apache-jena/bat/rupdate.bat b/apache-jena/bat/rupdate.bat
index 91267b7..b4696a5 100644
--- a/apache-jena/bat/rupdate.bat
+++ b/apache-jena/bat/rupdate.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.rupdate %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.rupdate %*

 exit /B


diff --git a/apache-jena/bat/schemagen.bat b/apache-jena/bat/schemagen.bat
index 0c579b3..ef4218f 100644
--- a/apache-jena/bat/schemagen.bat
+++ b/apache-jena/bat/schemagen.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" jena.schemagen %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" jena.schemagen %*

 exit /B


diff --git a/apache-jena/bat/shacl.bat b/apache-jena/bat/shacl.bat
index c0b999c..47db997 100644
--- a/apache-jena/bat/shacl.bat
+++ b/apache-jena/bat/shacl.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" shacl.shacl %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" shacl.shacl %*

 exit /B


diff --git a/apache-jena/bat/sparql.bat b/apache-jena/bat/sparql.bat
index 9ce809c..a029984 100644
--- a/apache-jena/bat/sparql.bat
+++ b/apache-jena/bat/sparql.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.sparql %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.sparql %*

 exit /B


diff --git a/apache-jena/bat/tdb2_tdbbackup.bat b/apache-jena/bat/tdb2_tdbbackup.bat
index a51b6a2..7177167 100644
--- a/apache-jena/bat/tdb2_tdbbackup.bat
+++ b/apache-jena/bat/tdb2_tdbbackup.bat

@@ -1,18 +1,18 @@
-@echo off
-@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if "%JENAROOT%" == "" goto :rootNotSet
-set JENA_HOME=%JENAROOT%
-:rootNotSet
-
-if NOT "%JENA_HOME%" == "" goto :okHome
-echo JENA_HOME not set
-exit /B
-
-:okHome
-set JENA_CP=%JENA_HOME%\lib\*;
-set LOGGING=file:%JENA_HOME%/jena-log4j.properties
-
-@rem JVM_ARGS comes from the environment.
-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbbackup %*
-exit /B
+@echo off

+@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0

+

+if "%JENAROOT%" == "" goto :rootNotSet

+set JENA_HOME=%JENAROOT%

+:rootNotSet

+

+if NOT "%JENA_HOME%" == "" goto :okHome

+echo JENA_HOME not set

+exit /B

+

+:okHome

+set JENA_CP=%JENA_HOME%\lib\*;

+set LOGGING=file:%JENA_HOME%/log4j2.properties

+

+@rem JVM_ARGS comes from the environment.

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbbackup %*

+exit /B


diff --git a/apache-jena/bat/tdb2_tdbcompact.bat b/apache-jena/bat/tdb2_tdbcompact.bat
index 87fc7ae..7beb076 100644
--- a/apache-jena/bat/tdb2_tdbcompact.bat
+++ b/apache-jena/bat/tdb2_tdbcompact.bat

@@ -1,18 +1,18 @@
-@echo off
-@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if "%JENAROOT%" == "" goto :rootNotSet
-set JENA_HOME=%JENAROOT%
-:rootNotSet
-
-if NOT "%JENA_HOME%" == "" goto :okHome
-echo JENA_HOME not set
-exit /B
-
-:okHome
-set JENA_CP=%JENA_HOME%\lib\*;
-set LOGGING=file:%JENA_HOME%/jena-log4j.properties
-
-@rem JVM_ARGS comes from the environment.
-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbcompact %*
-exit /B
+@echo off

+@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0

+

+if "%JENAROOT%" == "" goto :rootNotSet

+set JENA_HOME=%JENAROOT%

+:rootNotSet

+

+if NOT "%JENA_HOME%" == "" goto :okHome

+echo JENA_HOME not set

+exit /B

+

+:okHome

+set JENA_CP=%JENA_HOME%\lib\*;

+set LOGGING=file:%JENA_HOME%/log4j2.properties

+

+@rem JVM_ARGS comes from the environment.

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbcompact %*

+exit /B


diff --git a/apache-jena/bat/tdb2_tdbdump.bat b/apache-jena/bat/tdb2_tdbdump.bat
index 7ad54f9..70127e8 100644
--- a/apache-jena/bat/tdb2_tdbdump.bat
+++ b/apache-jena/bat/tdb2_tdbdump.bat

@@ -1,18 +1,18 @@
-@echo off
-@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if "%JENAROOT%" == "" goto :rootNotSet
-set JENA_HOME=%JENAROOT%
-:rootNotSet
-
-if NOT "%JENA_HOME%" == "" goto :okHome
-echo JENA_HOME not set
-exit /B
-
-:okHome
-set JENA_CP=%JENA_HOME%\lib\*;
-set LOGGING=file:%JENA_HOME%/jena-log4j.properties
-
-@rem JVM_ARGS comes from the environment.
-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbdump %*
-exit /B
+@echo off

+@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0

+

+if "%JENAROOT%" == "" goto :rootNotSet

+set JENA_HOME=%JENAROOT%

+:rootNotSet

+

+if NOT "%JENA_HOME%" == "" goto :okHome

+echo JENA_HOME not set

+exit /B

+

+:okHome

+set JENA_CP=%JENA_HOME%\lib\*;

+set LOGGING=file:%JENA_HOME%/log4j2.properties

+

+@rem JVM_ARGS comes from the environment.

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbdump %*

+exit /B


diff --git a/apache-jena/bat/tdb2_tdbloader.bat b/apache-jena/bat/tdb2_tdbloader.bat
index f848624..7371004 100644
--- a/apache-jena/bat/tdb2_tdbloader.bat
+++ b/apache-jena/bat/tdb2_tdbloader.bat

@@ -1,18 +1,18 @@
-@echo off
-@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if "%JENAROOT%" == "" goto :rootNotSet
-set JENA_HOME=%JENAROOT%
-:rootNotSet
-
-if NOT "%JENA_HOME%" == "" goto :okHome
-echo JENA_HOME not set
-exit /B
-
-:okHome
-set JENA_CP=%JENA_HOME%\lib\*;
-set LOGGING=file:%JENA_HOME%/jena-log4j.properties
-
-@rem JVM_ARGS comes from the environment.
-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbloader %*
-exit /B
+@echo off

+@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0

+

+if "%JENAROOT%" == "" goto :rootNotSet

+set JENA_HOME=%JENAROOT%

+:rootNotSet

+

+if NOT "%JENA_HOME%" == "" goto :okHome

+echo JENA_HOME not set

+exit /B

+

+:okHome

+set JENA_CP=%JENA_HOME%\lib\*;

+set LOGGING=file:%JENA_HOME%/log4j2.properties

+

+@rem JVM_ARGS comes from the environment.

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbloader %*

+exit /B


diff --git a/apache-jena/bat/tdb2_tdbquery.bat b/apache-jena/bat/tdb2_tdbquery.bat
index 33db6be..40ca010 100644
--- a/apache-jena/bat/tdb2_tdbquery.bat
+++ b/apache-jena/bat/tdb2_tdbquery.bat

@@ -1,18 +1,18 @@
-@echo off
-@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if "%JENAROOT%" == "" goto :rootNotSet
-set JENA_HOME=%JENAROOT%
-:rootNotSet
-
-if NOT "%JENA_HOME%" == "" goto :okHome
-echo JENA_HOME not set
-exit /B
-
-:okHome
-set JENA_CP=%JENA_HOME%\lib\*;
-set LOGGING=file:%JENA_HOME%/jena-log4j.properties
-
-@rem JVM_ARGS comes from the environment.
-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbquery %*
-exit /B
+@echo off

+@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0

+

+if "%JENAROOT%" == "" goto :rootNotSet

+set JENA_HOME=%JENAROOT%

+:rootNotSet

+

+if NOT "%JENA_HOME%" == "" goto :okHome

+echo JENA_HOME not set

+exit /B

+

+:okHome

+set JENA_CP=%JENA_HOME%\lib\*;

+set LOGGING=file:%JENA_HOME%/log4j2.properties

+

+@rem JVM_ARGS comes from the environment.

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbquery %*

+exit /B


diff --git a/apache-jena/bat/tdb2_tdbstats.bat b/apache-jena/bat/tdb2_tdbstats.bat
index a1d7b07..bd5691e 100644
--- a/apache-jena/bat/tdb2_tdbstats.bat
+++ b/apache-jena/bat/tdb2_tdbstats.bat

@@ -1,18 +1,18 @@
-@echo off
-@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if "%JENAROOT%" == "" goto :rootNotSet
-set JENA_HOME=%JENAROOT%
-:rootNotSet
-
-if NOT "%JENA_HOME%" == "" goto :okHome
-echo JENA_HOME not set
-exit /B
-
-:okHome
-set JENA_CP=%JENA_HOME%\lib\*;
-set LOGGING=file:%JENA_HOME%/jena-log4j.properties
-
-@rem JVM_ARGS comes from the environment.
-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbstats %*
-exit /B
+@echo off

+@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0

+

+if "%JENAROOT%" == "" goto :rootNotSet

+set JENA_HOME=%JENAROOT%

+:rootNotSet

+

+if NOT "%JENA_HOME%" == "" goto :okHome

+echo JENA_HOME not set

+exit /B

+

+:okHome

+set JENA_CP=%JENA_HOME%\lib\*;

+set LOGGING=file:%JENA_HOME%/log4j2.properties

+

+@rem JVM_ARGS comes from the environment.

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbstats %*

+exit /B


diff --git a/apache-jena/bat/tdb2_tdbupdate.bat b/apache-jena/bat/tdb2_tdbupdate.bat
index 6d79293..cf6bb60 100644
--- a/apache-jena/bat/tdb2_tdbupdate.bat
+++ b/apache-jena/bat/tdb2_tdbupdate.bat

@@ -1,18 +1,18 @@
-@echo off
-@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-if "%JENAROOT%" == "" goto :rootNotSet
-set JENA_HOME=%JENAROOT%
-:rootNotSet
-
-if NOT "%JENA_HOME%" == "" goto :okHome
-echo JENA_HOME not set
-exit /B
-
-:okHome
-set JENA_CP=%JENA_HOME%\lib\*;
-set LOGGING=file:%JENA_HOME%/jena-log4j.properties
-
-@rem JVM_ARGS comes from the environment.
-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbupdate %*
-exit /B
+@echo off

+@rem Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0

+

+if "%JENAROOT%" == "" goto :rootNotSet

+set JENA_HOME=%JENAROOT%

+:rootNotSet

+

+if NOT "%JENA_HOME%" == "" goto :okHome

+echo JENA_HOME not set

+exit /B

+

+:okHome

+set JENA_CP=%JENA_HOME%\lib\*;

+set LOGGING=file:%JENA_HOME%/log4j2.properties

+

+@rem JVM_ARGS comes from the environment.

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb2.tdbupdate %*

+exit /B


diff --git a/apache-jena/bat/tdbbackup.bat b/apache-jena/bat/tdbbackup.bat
index 342042c..5826424 100644
--- a/apache-jena/bat/tdbbackup.bat
+++ b/apache-jena/bat/tdbbackup.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb.tdbbackup %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb.tdbbackup %*

 exit /B


diff --git a/apache-jena/bat/tdbdump.bat b/apache-jena/bat/tdbdump.bat
index c727e16..13ad8b1 100644
--- a/apache-jena/bat/tdbdump.bat
+++ b/apache-jena/bat/tdbdump.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb.tdbdump %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb.tdbdump %*

 exit /B


diff --git a/apache-jena/bat/tdbloader.bat b/apache-jena/bat/tdbloader.bat
index 91ccdcb..122d883 100644
--- a/apache-jena/bat/tdbloader.bat
+++ b/apache-jena/bat/tdbloader.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb.tdbloader %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb.tdbloader %*

 exit /B


diff --git a/apache-jena/bat/tdbquery.bat b/apache-jena/bat/tdbquery.bat
index b192afb..c3782c0 100644
--- a/apache-jena/bat/tdbquery.bat
+++ b/apache-jena/bat/tdbquery.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb.tdbquery %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb.tdbquery %*

 exit /B


diff --git a/apache-jena/bat/tdbstats.bat b/apache-jena/bat/tdbstats.bat
index a2ec013..50e6658 100644
--- a/apache-jena/bat/tdbstats.bat
+++ b/apache-jena/bat/tdbstats.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb.tdbstats %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb.tdbstats %*

 exit /B


diff --git a/apache-jena/bat/tdbupdate.bat b/apache-jena/bat/tdbupdate.bat
index b8cf477..5a585de 100644
--- a/apache-jena/bat/tdbupdate.bat
+++ b/apache-jena/bat/tdbupdate.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" tdb.tdbupdate %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" tdb.tdbupdate %*

 exit /B


diff --git a/apache-jena/bat/trig.bat b/apache-jena/bat/trig.bat
index 83bf8a5..09595f9 100644
--- a/apache-jena/bat/trig.bat
+++ b/apache-jena/bat/trig.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.trig %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.trig %*

 exit /B


diff --git a/apache-jena/bat/turtle.bat b/apache-jena/bat/turtle.bat
index 8fec622..8440cb8 100644
--- a/apache-jena/bat/turtle.bat
+++ b/apache-jena/bat/turtle.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.turtle %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.turtle %*

 exit /B


diff --git a/apache-jena/bat/uparse.bat b/apache-jena/bat/uparse.bat
index ea45d6f..e3c6fcd 100644
--- a/apache-jena/bat/uparse.bat
+++ b/apache-jena/bat/uparse.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.uparse %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.uparse %*

 exit /B


diff --git a/apache-jena/bat/update.bat b/apache-jena/bat/update.bat
index be90ece..175a400 100644
--- a/apache-jena/bat/update.bat
+++ b/apache-jena/bat/update.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.update %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.update %*

 exit /B


diff --git a/apache-jena/bat/utf8.bat b/apache-jena/bat/utf8.bat
index 84c40a4..4b27142 100644
--- a/apache-jena/bat/utf8.bat
+++ b/apache-jena/bat/utf8.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" riotcmd.utf8 %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" riotcmd.utf8 %*

 exit /B


diff --git a/apache-jena/bat/wwwdec.bat b/apache-jena/bat/wwwdec.bat
index 23d7ed3..f803fe9 100644
--- a/apache-jena/bat/wwwdec.bat
+++ b/apache-jena/bat/wwwdec.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.wwwdec %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.wwwdec %*

 exit /B


diff --git a/apache-jena/bat/wwwenc.bat b/apache-jena/bat/wwwenc.bat
index f62473f..6f690db 100644
--- a/apache-jena/bat/wwwenc.bat
+++ b/apache-jena/bat/wwwenc.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" arq.wwwenc %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.wwwenc %*

 exit /B


diff --git a/apache-jena/bin/arq b/apache-jena/bin/arq
index ad0180c..f450672 100755
--- a/apache-jena/bin/arq
+++ b/apache-jena/bin/arq

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.arq "$@" 

diff --git a/apache-jena/bin/infer b/apache-jena/bin/infer
index 2bb9e07..9a05f48 100755
--- a/apache-jena/bin/infer
+++ b/apache-jena/bin/infer

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.infer "$@" 

diff --git a/apache-jena/bin/iri b/apache-jena/bin/iri
index 0e21c2a..574b45b 100755
--- a/apache-jena/bin/iri
+++ b/apache-jena/bin/iri

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.iri "$@" 

diff --git a/apache-jena/bin/juuid b/apache-jena/bin/juuid
index b02286b..c363272 100755
--- a/apache-jena/bin/juuid
+++ b/apache-jena/bin/juuid

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.juuid "$@" 

diff --git a/apache-jena/bin/nquads b/apache-jena/bin/nquads
index cafef1c..c09d483 100755
--- a/apache-jena/bin/nquads
+++ b/apache-jena/bin/nquads

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.nquads "$@" 

diff --git a/apache-jena/bin/ntriples b/apache-jena/bin/ntriples
index 67d387c..dff55c1 100755
--- a/apache-jena/bin/ntriples
+++ b/apache-jena/bin/ntriples

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.ntriples "$@" 

diff --git a/apache-jena/bin/qparse b/apache-jena/bin/qparse
index 368d336..eb1c8e0 100755
--- a/apache-jena/bin/qparse
+++ b/apache-jena/bin/qparse

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.qparse "$@" 

diff --git a/apache-jena/bin/rdfcat b/apache-jena/bin/rdfcat
index 1e6038b..e08c6b6 100755
--- a/apache-jena/bin/rdfcat
+++ b/apache-jena/bin/rdfcat

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfcat "$@" 

diff --git a/apache-jena/bin/rdfcompare b/apache-jena/bin/rdfcompare
index 7c53b4b..6e26da4 100755
--- a/apache-jena/bin/rdfcompare
+++ b/apache-jena/bin/rdfcompare

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfcompare "$@" 

diff --git a/apache-jena/bin/rdfcopy b/apache-jena/bin/rdfcopy
index a7a942e..8b3bc7c 100755
--- a/apache-jena/bin/rdfcopy
+++ b/apache-jena/bin/rdfcopy

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfcopy "$@" 

diff --git a/apache-jena/bin/rdfdiff b/apache-jena/bin/rdfdiff
index 22591d4..f48a40e 100755
--- a/apache-jena/bin/rdfdiff
+++ b/apache-jena/bin/rdfdiff

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rdfdiff "$@" 

diff --git a/apache-jena/bin/rdfparse b/apache-jena/bin/rdfparse
index 675019b..69e6a90 100755
--- a/apache-jena/bin/rdfparse
+++ b/apache-jena/bin/rdfparse

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfparse "$@" 

diff --git a/apache-jena/bin/rdfxml b/apache-jena/bin/rdfxml
index e94cba9..bbb56bf 100755
--- a/apache-jena/bin/rdfxml
+++ b/apache-jena/bin/rdfxml

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.rdfxml "$@" 

diff --git a/apache-jena/bin/riot b/apache-jena/bin/riot
index 89fdf70..c0e4910 100755
--- a/apache-jena/bin/riot
+++ b/apache-jena/bin/riot

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.riot "$@" 

diff --git a/apache-jena/bin/rset b/apache-jena/bin/rset
index 2d5648f..1952a8f 100755
--- a/apache-jena/bin/rset
+++ b/apache-jena/bin/rset

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rset "$@" 

diff --git a/apache-jena/bin/rsparql b/apache-jena/bin/rsparql
index b9be84a..8ff5134 100755
--- a/apache-jena/bin/rsparql
+++ b/apache-jena/bin/rsparql

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rsparql "$@" 

diff --git a/apache-jena/bin/rupdate b/apache-jena/bin/rupdate
index 91ea58d..1afeaf2 100755
--- a/apache-jena/bin/rupdate
+++ b/apache-jena/bin/rupdate

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rupdate "$@" 

diff --git a/apache-jena/bin/schemagen b/apache-jena/bin/schemagen
index 29ab7cd..ac32fdd 100755
--- a/apache-jena/bin/schemagen
+++ b/apache-jena/bin/schemagen

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.schemagen "$@" 

diff --git a/apache-jena/bin/shacl b/apache-jena/bin/shacl
index a4338d6..b8680f4 100755
--- a/apache-jena/bin/shacl
+++ b/apache-jena/bin/shacl

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" shacl.shacl "$@" 

diff --git a/apache-jena/bin/sparql b/apache-jena/bin/sparql
index 8f1e1b2..cf6d19a 100755
--- a/apache-jena/bin/sparql
+++ b/apache-jena/bin/sparql

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.sparql "$@" 

diff --git a/apache-jena/bin/tdb2.tdbbackup b/apache-jena/bin/tdb2.tdbbackup
index a11ce74..2dc7428 100755
--- a/apache-jena/bin/tdb2.tdbbackup
+++ b/apache-jena/bin/tdb2.tdbbackup

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbbackup "$@" 

diff --git a/apache-jena/bin/tdb2.tdbcompact b/apache-jena/bin/tdb2.tdbcompact
index 10c28ff..a6ad298 100755
--- a/apache-jena/bin/tdb2.tdbcompact
+++ b/apache-jena/bin/tdb2.tdbcompact

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbcompact "$@" 

diff --git a/apache-jena/bin/tdb2.tdbdump b/apache-jena/bin/tdb2.tdbdump
index b5f5121..5ba9969 100755
--- a/apache-jena/bin/tdb2.tdbdump
+++ b/apache-jena/bin/tdb2.tdbdump

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbdump "$@" 

diff --git a/apache-jena/bin/tdb2.tdbloader b/apache-jena/bin/tdb2.tdbloader
index 1b3b246..9385c98 100755
--- a/apache-jena/bin/tdb2.tdbloader
+++ b/apache-jena/bin/tdb2.tdbloader

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbloader "$@" 

diff --git a/apache-jena/bin/tdb2.tdbquery b/apache-jena/bin/tdb2.tdbquery
index aa380fb..a8406e2 100755
--- a/apache-jena/bin/tdb2.tdbquery
+++ b/apache-jena/bin/tdb2.tdbquery

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbquery "$@" 

diff --git a/apache-jena/bin/tdb2.tdbstats b/apache-jena/bin/tdb2.tdbstats
index 36363b5..2d6289b 100644
--- a/apache-jena/bin/tdb2.tdbstats
+++ b/apache-jena/bin/tdb2.tdbstats

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbstats "$@" 

diff --git a/apache-jena/bin/tdb2.tdbupdate b/apache-jena/bin/tdb2.tdbupdate
index b943a18..a90ff64 100755
--- a/apache-jena/bin/tdb2.tdbupdate
+++ b/apache-jena/bin/tdb2.tdbupdate

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbupdate "$@" 

diff --git a/apache-jena/bin/tdbbackup b/apache-jena/bin/tdbbackup
index 864ab4b..b524b9a 100755
--- a/apache-jena/bin/tdbbackup
+++ b/apache-jena/bin/tdbbackup

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbbackup "$@" 

diff --git a/apache-jena/bin/tdbdump b/apache-jena/bin/tdbdump
index 9c2cb5b..3a777c9 100755
--- a/apache-jena/bin/tdbdump
+++ b/apache-jena/bin/tdbdump

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbdump "$@" 

diff --git a/apache-jena/bin/tdbloader b/apache-jena/bin/tdbloader
index 0f0354f..5ce34be 100755
--- a/apache-jena/bin/tdbloader
+++ b/apache-jena/bin/tdbloader

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbloader "$@" 

diff --git a/apache-jena/bin/tdbquery b/apache-jena/bin/tdbquery
index 94503b9..ed82731 100755
--- a/apache-jena/bin/tdbquery
+++ b/apache-jena/bin/tdbquery

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbquery "$@" 

diff --git a/apache-jena/bin/tdbstats b/apache-jena/bin/tdbstats
index a74bffe..d02d3db 100755
--- a/apache-jena/bin/tdbstats
+++ b/apache-jena/bin/tdbstats

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbstats "$@" 

diff --git a/apache-jena/bin/tdbupdate b/apache-jena/bin/tdbupdate
index 24692cf..e8b1829 100755
--- a/apache-jena/bin/tdbupdate
+++ b/apache-jena/bin/tdbupdate

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbupdate "$@" 

diff --git a/apache-jena/bin/trig b/apache-jena/bin/trig
index d9c7609..d0cbd43 100755
--- a/apache-jena/bin/trig
+++ b/apache-jena/bin/trig

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.trig "$@" 

diff --git a/apache-jena/bin/turtle b/apache-jena/bin/turtle
index f42f276..6a9df02 100755
--- a/apache-jena/bin/turtle
+++ b/apache-jena/bin/turtle

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.turtle "$@" 

diff --git a/apache-jena/bin/uparse b/apache-jena/bin/uparse
index 8d345be..d19fcd6 100755
--- a/apache-jena/bin/uparse
+++ b/apache-jena/bin/uparse

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.uparse "$@" 

diff --git a/apache-jena/bin/update b/apache-jena/bin/update
index 9c1c1ee..bbd1b15 100755
--- a/apache-jena/bin/update
+++ b/apache-jena/bin/update

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.update "$@" 

diff --git a/apache-jena/bin/utf8 b/apache-jena/bin/utf8
index a6b053e..f69c2bf 100755
--- a/apache-jena/bin/utf8
+++ b/apache-jena/bin/utf8

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.utf8 "$@" 

diff --git a/apache-jena/bin/wwwdec b/apache-jena/bin/wwwdec
index e21e574..c470c6b 100755
--- a/apache-jena/bin/wwwdec
+++ b/apache-jena/bin/wwwdec

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.wwwdec "$@" 

diff --git a/apache-jena/bin/wwwenc b/apache-jena/bin/wwwenc
index 460eea6..9daeb27 100755
--- a/apache-jena/bin/wwwenc
+++ b/apache-jena/bin/wwwenc

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.wwwenc "$@" 

diff --git a/apache-jena/log4j2.properties b/apache-jena/log4j2.properties
index 4d2248a..c5213b5 100644
--- a/apache-jena/log4j2.properties
+++ b/apache-jena/log4j2.properties

@@ -7,32 +7,59 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-15c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-15c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = INFO
 
-logger.arq-info.name  = org.apache.jena.arq.info
-logger.arq-info.level = INFO
-
 logger.arq-exec.name  = org.apache.jena.arq.exec
 logger.arq-exec.level = INFO
 
+logger.arq-info.name  = org.apache.jena.arq.exec
+logger.arq-info.level = INFO
+
 logger.riot.name  = org.apache.jena.riot
 logger.riot.level = INFO
 
-# Loaders
-logger.tdb1-loader.name = org.apache.jena.tdb.loader
-logger.tdb1-loader.level = INFO
+logger.fuseki.name  = org.apache.jena.fuseki
+logger.fuseki.level = INFO
 
-logger.tdb2-loader.name = org.apache.jena.tdb2.loader
-logger.tdb2-loader.level = INFO
+logger.fuseki-fuseki.name  = org.apache.jena.fuseki.Fuseki
+logger.fuseki-fuseki.level = INFO
 
-logger.tdb.name = TDB
-logger.tdb.level = INFO
+logger.fuseki-server.name  = org.apache.jena.fuseki.Server
+logger.fuseki-server.level = INFO
+
+logger.fuseki-admin.name  = org.apache.jena.fuseki.Admin
+logger.fuseki-admin.level = INFO
+
+logger.jetty.name  = org.eclipse.jetty
+logger.jetty.level = WARN
+
+# May be useful to turn up to DEBUG if debugging HTTP communication issues
+logger.apache-http.name   = org.apache.http
+logger.apache-http.level  = WARN
+
+logger.shiro.name = org.apache.shiro
+logger.shiro.level = WARN
+# Hide bug in Shiro 1.5.0
+logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
+logger.shiro-realm.level = ERROR
+
+# This goes out in NCSA format
+appender.plain.type = Console
+appender.plain.name = PLAIN
+appender.plain.layout.type = PatternLayout
+appender.plain.layout.pattern = %m%n
+
+logger.request-log.name                   = org.apache.jena.fuseki.Request
+logger.request-log.additivity             = false
+logger.request-log.level                  = OFF
+logger.request-log.appenderRef.plain.ref  = PLAIN

diff --git a/apache-jena/template.bat b/apache-jena/template.bat
index 9f9ec74..51a50d7 100644
--- a/apache-jena/template.bat
+++ b/apache-jena/template.bat

@@ -11,8 +11,8 @@
 

 :okHome

 set JENA_CP=%JENA_HOME%\lib\*;

-set LOGGING=file:%JENA_HOME%/jena-log4j.properties

+set LOGGING=file:%JENA_HOME%/log4j2.properties

 

 @rem JVM_ARGS comes from the environment.

-java %JVM_ARGS% -Dlog4j.configuration="%LOGGING%" -cp "%JENA_CP%" JENA_CMD %*

+java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" JENA_CMD %*

 exit /B


diff --git a/apache-jena/template.bin b/apache-jena/template.bin
index b2749e5..be1776e 100644
--- a/apache-jena/template.bin
+++ b/apache-jena/template.bin

@@ -67,8 +67,7 @@
 # JVM_ARGS : don't set here but it can be set in the environment.
 # Expand JENA_HOME but literal *
 JENA_CP="$JENA_HOME"'/lib/*'
-SOCKS=
-LOGGING="${LOGGING:--Dlog4j.configuration=file:$JENA_HOME/jena-log4j.properties}"
+LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
 
 # Platform specific fixup
 # On CYGWIN convert path and end with a ';' 
@@ -79,11 +78,11 @@
 # Respect TMPDIR or TMP (windows?) if present
 # important for tdbloader spill
 if [ -n "$TMPDIR" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMPDIR\""
 elif [ -n "$TMP" ]
-	then
-	JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
+then
+    JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
 fi
 
 java $JVM_ARGS $LOGGING -cp "$JENA_CP" JENA_CMD "$@" 

diff --git a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java
index dfbc981..f84e97b 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/QueryExecutionFactory.java

@@ -490,7 +490,7 @@
      * @return QueryExecution
      */ 
     static public QueryExecution sparqlService(String service, Query query, String defaultGraph, HttpClient client) {
-       return sparqlService(service, query, client, null);
+       return sparqlService(service, query, defaultGraph, client, null);
     }
     
     /** Create a QueryExecution that will access a SPARQL service over HTTP

diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/ARQFunctions.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/ARQFunctions.java
index 544de86..a7452a4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/ARQFunctions.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/ARQFunctions.java

@@ -23,7 +23,7 @@
 
 /** Load ARQ functions ().
  * The one in package {@link org.apache.jena.sparql.function.library}
- * can be invoked by afn:name without registration because afn:->java: is built-in
+ * can be invoked by afn:name without registration because afn:-&gt;java: is built-in
  * in MappedLoader.
  *
  * @see ARQConstants#ARQFunctionLibraryURI

diff --git a/jena-arq/src/test/resources/log4j2.properties b/jena-arq/src/test/resources/log4j2.properties
index 8bd4133..5eaf100 100644
--- a/jena-arq/src/test/resources/log4j2.properties
+++ b/jena-arq/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

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 fe83d5c..e61e33a 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

@@ -248,13 +248,14 @@
         , "filter.threshold.level = INFO"
 
         , "appender.console.type = Console"
-        , "appender.console.name = STDOUT"
+        , "appender.console.name = OUT"
+        , "appender.console.target = SYSTEM_ERR"
         , "appender.console.layout.type = PatternLayout"
         , "appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n"
         , "#appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n"
 
         , "rootLogger.level                  = INFO"
-        , "rootLogger.appenderRef.stdout.ref = STDOUT"
+        , "rootLogger.appenderRef.stdout.ref = OUT"
 
         , "logger.jena.name  = org.apache.jena"
         , "logger.jena.level = INFO"

diff --git a/jena-base/src/test/resources/log4j2.properties b/jena-base/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-base/src/test/resources/log4j2.properties
+++ b/jena-base/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFVisitor.java b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFVisitor.java
index 44a6f8f..eccd1d7 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFVisitor.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFVisitor.java

@@ -43,7 +43,7 @@
     /**
      * Method to call when visiting a resource with a statement.
      *   @param r the resource node being visited
-     *   @param uri the statement of that node
+     *   @param statement the statement of that node
      *   @return value to be returned from the visit
      */ 
         

diff --git a/jena-core/src/test/resources/log4j2.properties b/jena-core/src/test/resources/log4j2.properties
index ac41485..000a9f9 100644
--- a/jena-core/src/test/resources/log4j2.properties
+++ b/jena-core/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-db/jena-dboe-base/src/test/resources/log4j2.properties b/jena-db/jena-dboe-base/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-db/jena-dboe-base/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-base/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties b/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-db/jena-dboe-index/src/test/resources/log4j2.properties b/jena-db/jena-dboe-index/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-db/jena-dboe-index/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-index/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties b/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties b/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties b/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties
+++ b/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-db/jena-tdb2/src/test/resources/log4j2.properties b/jena-db/jena-tdb2/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-db/jena-tdb2/src/test/resources/log4j2.properties
+++ b/jena-db/jena-tdb2/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties b/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties
+++ b/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-fuseki2/apache-jena-fuseki/log4j2.properties b/jena-fuseki2/apache-jena-fuseki/log4j2.properties
index 5d889cd..c5213b5 100644
--- a/jena-fuseki2/apache-jena-fuseki/log4j2.properties
+++ b/jena-fuseki2/apache-jena-fuseki/log4j2.properties

@@ -7,13 +7,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
-#appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
+appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-15c{1} :: %m%n
+#appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-15c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = INFO
@@ -21,42 +22,38 @@
 logger.arq-exec.name  = org.apache.jena.arq.exec
 logger.arq-exec.level = INFO
 
+logger.arq-info.name  = org.apache.jena.arq.exec
+logger.arq-info.level = INFO
+
 logger.riot.name  = org.apache.jena.riot
 logger.riot.level = INFO
 
-# All logs : .Request, .Fuseki, .Server
 logger.fuseki.name  = org.apache.jena.fuseki
 logger.fuseki.level = INFO
 
-logger.fuseki-request.name  = org.apache.jena.fuseki.Request
-logger.fuseki-request.level = INFO
-
 logger.fuseki-fuseki.name  = org.apache.jena.fuseki.Fuseki
 logger.fuseki-fuseki.level = INFO
 
 logger.fuseki-server.name  = org.apache.jena.fuseki.Server
 logger.fuseki-server.level = INFO
 
-logger.fuseki-config.name  = org.apache.jena.fuseki.Config
-logger.fuseki-config.level = WARN
-
 logger.fuseki-admin.name  = org.apache.jena.fuseki.Admin
-logger.fuseki-admin.level = WARN
+logger.fuseki-admin.level = INFO
 
 logger.jetty.name  = org.eclipse.jetty
 logger.jetty.level = WARN
 
-# Hide bug in Shiro 1.5.0
-logger.shiro.name = org.apache.shiro
-logger.shiro.level = WARN
-logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
-logger.shiro-realm.level = ERROR
-
 # May be useful to turn up to DEBUG if debugging HTTP communication issues
 logger.apache-http.name   = org.apache.http
 logger.apache-http.level  = WARN
 
-# This goes up in NCSA format
+logger.shiro.name = org.apache.shiro
+logger.shiro.level = WARN
+# Hide bug in Shiro 1.5.0
+logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
+logger.shiro-realm.level = ERROR
+
+# This goes out in NCSA format
 appender.plain.type = Console
 appender.plain.name = PLAIN
 appender.plain.layout.type = PatternLayout

diff --git a/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
index 1aa9697..02641a0 100644
--- a/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties

@@ -7,13 +7,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = INFO

diff --git a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/log4j2.properties b/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/log4j2.properties
deleted file mode 100644
index 676d89e..0000000
--- a/jena-fuseki2/jena-fuseki-core/src/main/resources/org/apache/jena/fuseki/log4j2.properties
+++ /dev/null

@@ -1,53 +0,0 @@
-## Licensed under the terms of http://www.apache.org/licenses/LICENSE-2.0
-
-## Plain output to stdout
-status = error
-name = PropertiesConfig
-filters = threshold
-
-filter.threshold.type = ThresholdFilter
-filter.threshold.level = INFO
-
-appender.console.type = Console
-appender.console.name = STDOUT
-appender.console.layout.type = PatternLayout
-appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-10c{1} %-5p %m%n
-
-rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
-
-logger.jena.name  = org.apache.jena
-logger.jena.level = INFO
-
-logger.arq-exec.name  = org.apache.jena.arq.exec
-logger.arq-exec.level = INFO
-
-logger.riot.name  = org.apache.jena.riot
-logger.riot.level = INFO
-
-logger.fuseki.name  = org.apache.jena.fuseki
-logger.fuseki.level = INFO
-
-logger.jetty.name  = org.eclipse.jetty
-logger.jetty.level = WARN
-
-logger.apache-http.name   = org.apache.http
-logger.apache-http.level  = WARN
-
-logger.shiro.name = org.apache.shiro
-logger.shiro.level = WARN
-
-# Hide bug in Shiro 1.5.0
-logger.shiro-realm.name = org.apache.shiro.realm.text.IniRealm
-logger.shiro-realm.level = ERROR
-
-# This goes out in NCSA format
-appender.plain.type = Console
-appender.plain.name = PLAIN
-appender.plain.layout.type = PatternLayout
-appender.plain.layout.pattern = %m%n
-
-logger.request-log.name                   = org.apache.jena.fuseki.Request
-logger.request-log.additivity             = false
-logger.request-log.level                  = OFF
-logger.request-log.appenderRef.plain.ref  = PLAIN

diff --git a/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties
index 1aa9697..02641a0 100644
--- a/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-core/src/test/resources/log4j2.properties

@@ -7,13 +7,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = INFO

diff --git a/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
index 1aa9697..02641a0 100644
--- a/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties

@@ -7,13 +7,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = INFO

diff --git a/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
index 1aa9697..02641a0 100644
--- a/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties

@@ -7,13 +7,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = INFO

diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties b/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
index 8f78ae5..f2f5424 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties

@@ -7,13 +7,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = INFO

diff --git a/jena-integration-tests/src/test/resources/log4j2.properties b/jena-integration-tests/src/test/resources/log4j2.properties
index 8e229c0..b7e3022 100644
--- a/jena-integration-tests/src/test/resources/log4j2.properties
+++ b/jena-integration-tests/src/test/resources/log4j2.properties

@@ -8,13 +8,15 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-permissions/src/test/resources/log4j2.properties b/jena-permissions/src/test/resources/log4j2.properties
index 94d0b76..635d781 100644
--- a/jena-permissions/src/test/resources/log4j2.properties
+++ b/jena-permissions/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = ERROR

diff --git a/jena-rdfconnection/src/test/resources/log4j2.properties b/jena-rdfconnection/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-rdfconnection/src/test/resources/log4j2.properties
+++ b/jena-rdfconnection/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-shacl/src/test/resources/log4j2.properties b/jena-shacl/src/test/resources/log4j2.properties
index 4492c4b..705dcdd 100644
--- a/jena-shacl/src/test/resources/log4j2.properties
+++ b/jena-shacl/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-spatial/src/test/resources/log4j2.properties b/jena-spatial/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-spatial/src/test/resources/log4j2.properties
+++ b/jena-spatial/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-tdb/src/test/resources/log4j2.properties b/jena-tdb/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-tdb/src/test/resources/log4j2.properties
+++ b/jena-tdb/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/jena-text/src/test/resources/log4j2.properties b/jena-text/src/test/resources/log4j2.properties
index 77fc564..4dc512f 100644
--- a/jena-text/src/test/resources/log4j2.properties
+++ b/jena-text/src/test/resources/log4j2.properties

@@ -8,13 +8,14 @@
 filter.threshold.level = INFO
 
 appender.console.type = Console
-appender.console.name = STDOUT
+appender.console.name = OUT
+appender.console.target = SYSTEM_ERR
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = %d{HH:mm:ss} %-5p %-10c{1} :: %m%n
 #appender.console.layout.pattern = [%d{yyyy-MM-dd HH:mm:ss}] %-5p %-10c{1} :: %m%n
 
 rootLogger.level                  = INFO
-rootLogger.appenderRef.stdout.ref = STDOUT
+rootLogger.appenderRef.stdout.ref = OUT
 
 logger.jena.name  = org.apache.jena
 logger.jena.level = WARN

diff --git a/pom.xml b/pom.xml
index 745f916..1aee6dd 100644
--- a/pom.xml
+++ b/pom.xml

@@ -55,7 +55,7 @@
 
     <ver.slf4j>1.7.30</ver.slf4j>
     <ver.log4j2>2.13.3</ver.log4j2>
-    <ver.shade-plugin>3.2.3</ver.shade-plugin>
+    <ver.shade-plugin>3.2.1</ver.shade-plugin>
 
     <ver.jetty>9.4.26.v20200117</ver.jetty>
     <ver.shiro>1.5.1</ver.shiro>
commit	50504d942d9420ac2d3dc40e9c19bde91bff6560	[log] [tgz]
author	Andy Seaborne <andy@apache.org>	Mon Jun 01 17:26:16 2020 +0100
committer	GitHub <noreply@github.com>	Mon Jun 01 17:26:16 2020 +0100
tree	7a6a1b264beffde881055f7f5a7ea80607444eef
parent	0a68b9d52ee31bcd8d59109fc230158c9464aa56 [diff]
parent	eaca80f6609fff4602094060a711f72a041c6364 [diff]