You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2023/05/23 09:27:42 UTC
[jena] branch main updated: Update scripts for CLASSPATH
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 16f0c0bc6a Update scripts for CLASSPATH
new 27d856bc75 Merge pull request #1878 from afs/script-update
16f0c0bc6a is described below
commit 16f0c0bc6a4d40904a4482d746c862f80d917bb2
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Tue May 23 08:40:02 2023 +0100
Update scripts for CLASSPATH
---
apache-jena/bat/arq.bat | 4 ++++
apache-jena/bat/infer.bat | 4 ++++
apache-jena/bat/iri.bat | 4 ++++
apache-jena/bat/jena_version.bat | 4 ++++
apache-jena/bat/juuid.bat | 4 ++++
apache-jena/bat/nquads.bat | 4 ++++
apache-jena/bat/ntriples.bat | 4 ++++
apache-jena/bat/qparse.bat | 4 ++++
apache-jena/bat/rdfcat.bat | 4 ++++
apache-jena/bat/rdfcompare.bat | 4 ++++
apache-jena/bat/rdfcopy.bat | 4 ++++
apache-jena/bat/rdfdiff.bat | 4 ++++
apache-jena/bat/rdfparse.bat | 4 ++++
apache-jena/bat/rdfpatch.bat | 4 ++++
apache-jena/bat/rdfxml.bat | 4 ++++
apache-jena/bat/riot.bat | 4 ++++
apache-jena/bat/rset.bat | 4 ++++
apache-jena/bat/rsparql.bat | 4 ++++
apache-jena/bat/rupdate.bat | 4 ++++
apache-jena/bat/schemagen.bat | 4 ++++
apache-jena/bat/shacl.bat | 4 ++++
apache-jena/bat/shex.bat | 4 ++++
apache-jena/bat/sparql.bat | 4 ++++
apache-jena/bat/tdb2_tdbbackup.bat | 4 ++++
apache-jena/bat/tdb2_tdbcompact.bat | 4 ++++
apache-jena/bat/tdb2_tdbdump.bat | 4 ++++
apache-jena/bat/tdb2_tdbloader.bat | 4 ++++
apache-jena/bat/tdb2_tdbquery.bat | 4 ++++
apache-jena/bat/tdb2_tdbstats.bat | 4 ++++
apache-jena/bat/tdb2_tdbupdate.bat | 4 ++++
apache-jena/bat/tdbbackup.bat | 4 ++++
apache-jena/bat/tdbdump.bat | 4 ++++
apache-jena/bat/tdbloader.bat | 4 ++++
apache-jena/bat/tdbquery.bat | 4 ++++
apache-jena/bat/tdbstats.bat | 4 ++++
apache-jena/bat/tdbupdate.bat | 4 ++++
apache-jena/bat/trig.bat | 4 ++++
apache-jena/bat/turtle.bat | 4 ++++
apache-jena/bat/uparse.bat | 4 ++++
apache-jena/bat/update.bat | 4 ++++
apache-jena/bat/utf8.bat | 4 ++++
apache-jena/bat/wwwdec.bat | 4 ++++
apache-jena/bat/wwwenc.bat | 4 ++++
apache-jena/bin/arq | 7 +++++++
apache-jena/bin/infer | 7 +++++++
apache-jena/bin/iri | 7 +++++++
apache-jena/bin/jena.version | 7 +++++++
apache-jena/bin/juuid | 7 +++++++
apache-jena/bin/nquads | 7 +++++++
apache-jena/bin/ntriples | 7 +++++++
apache-jena/bin/qparse | 7 +++++++
apache-jena/bin/rdfcat | 7 +++++++
apache-jena/bin/rdfcompare | 7 +++++++
apache-jena/bin/rdfcopy | 7 +++++++
apache-jena/bin/rdfdiff | 7 +++++++
apache-jena/bin/rdfparse | 7 +++++++
apache-jena/bin/rdfpatch | 7 +++++++
apache-jena/bin/rdfxml | 7 +++++++
apache-jena/bin/riot | 7 +++++++
apache-jena/bin/rset | 7 +++++++
apache-jena/bin/rsparql | 7 +++++++
apache-jena/bin/rupdate | 7 +++++++
apache-jena/bin/schemagen | 7 +++++++
apache-jena/bin/shacl | 7 +++++++
apache-jena/bin/shex | 7 +++++++
apache-jena/bin/sparql | 7 +++++++
apache-jena/bin/tdb2.tdbbackup | 7 +++++++
apache-jena/bin/tdb2.tdbcompact | 7 +++++++
apache-jena/bin/tdb2.tdbdump | 7 +++++++
apache-jena/bin/tdb2.tdbloader | 7 +++++++
apache-jena/bin/tdb2.tdbquery | 7 +++++++
apache-jena/bin/tdb2.tdbstats | 7 +++++++
apache-jena/bin/tdb2.tdbupdate | 7 +++++++
apache-jena/bin/tdbbackup | 7 +++++++
apache-jena/bin/tdbdump | 7 +++++++
apache-jena/bin/tdbloader | 7 +++++++
apache-jena/bin/tdbquery | 7 +++++++
apache-jena/bin/tdbstats | 7 +++++++
apache-jena/bin/tdbupdate | 7 +++++++
apache-jena/bin/trig | 7 +++++++
apache-jena/bin/turtle | 7 +++++++
apache-jena/bin/uparse | 7 +++++++
apache-jena/bin/update | 7 +++++++
apache-jena/bin/utf8 | 7 +++++++
apache-jena/bin/wwwdec | 7 +++++++
apache-jena/bin/wwwenc | 7 +++++++
apache-jena/template.bat | 4 ++++
apache-jena/template.bin | 9 ++++++++-
88 files changed, 485 insertions(+), 1 deletion(-)
diff --git a/apache-jena/bat/arq.bat b/apache-jena/bat/arq.bat
index 2e7ae307ac..c877acb06f 100644
--- a/apache-jena/bat/arq.bat
+++ b/apache-jena/bat/arq.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 b6a9662320..d6cd20cf4f 100644
--- a/apache-jena/bat/infer.bat
+++ b/apache-jena/bat/infer.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 6cd89835f6..4e17afbc79 100644
--- a/apache-jena/bat/iri.bat
+++ b/apache-jena/bat/iri.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" arq.iri %*
exit /B
diff --git a/apache-jena/bat/jena_version.bat b/apache-jena/bat/jena_version.bat
index bf26e96326..e9aaec98da 100644
--- a/apache-jena/bat/jena_version.bat
+++ b/apache-jena/bat/jena_version.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" jena.version %*
exit /B
diff --git a/apache-jena/bat/juuid.bat b/apache-jena/bat/juuid.bat
index cc5be2a864..9e0b28f6da 100644
--- a/apache-jena/bat/juuid.bat
+++ b/apache-jena/bat/juuid.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 f1a66d1fa3..75940262fd 100644
--- a/apache-jena/bat/nquads.bat
+++ b/apache-jena/bat/nquads.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 eaa9b4233e..2934782df5 100644
--- a/apache-jena/bat/ntriples.bat
+++ b/apache-jena/bat/ntriples.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 19f080b12a..687d9822ce 100644
--- a/apache-jena/bat/qparse.bat
+++ b/apache-jena/bat/qparse.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 1861b25395..5ae590494d 100644
--- a/apache-jena/bat/rdfcat.bat
+++ b/apache-jena/bat/rdfcat.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 9e28ce3499..8f4150e70f 100644
--- a/apache-jena/bat/rdfcompare.bat
+++ b/apache-jena/bat/rdfcompare.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 c9344b0955..dbe766ed5d 100644
--- a/apache-jena/bat/rdfcopy.bat
+++ b/apache-jena/bat/rdfcopy.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 0dcff01d1f..524e66d8b1 100644
--- a/apache-jena/bat/rdfdiff.bat
+++ b/apache-jena/bat/rdfdiff.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 43721df31d..f31ae47107 100644
--- a/apache-jena/bat/rdfparse.bat
+++ b/apache-jena/bat/rdfparse.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" jena.rdfparse %*
exit /B
diff --git a/apache-jena/bat/rdfpatch.bat b/apache-jena/bat/rdfpatch.bat
index 4de59739bf..81b0cc7e09 100644
--- a/apache-jena/bat/rdfpatch.bat
+++ b/apache-jena/bat/rdfpatch.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" rdfpatch.rdfpatch %*
exit /B
diff --git a/apache-jena/bat/rdfxml.bat b/apache-jena/bat/rdfxml.bat
index 268b7d9dd7..718251b74d 100644
--- a/apache-jena/bat/rdfxml.bat
+++ b/apache-jena/bat/rdfxml.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 63f4332db7..d4d5e31a37 100644
--- a/apache-jena/bat/riot.bat
+++ b/apache-jena/bat/riot.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 b47515a917..e03a1fca5b 100644
--- a/apache-jena/bat/rset.bat
+++ b/apache-jena/bat/rset.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 c359713f64..767afb5e35 100644
--- a/apache-jena/bat/rsparql.bat
+++ b/apache-jena/bat/rsparql.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 b4696a585e..aa0182911a 100644
--- a/apache-jena/bat/rupdate.bat
+++ b/apache-jena/bat/rupdate.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 ef4218fa09..57d3001ac4 100644
--- a/apache-jena/bat/schemagen.bat
+++ b/apache-jena/bat/schemagen.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 47db9971f9..51fccc43cc 100644
--- a/apache-jena/bat/shacl.bat
+++ b/apache-jena/bat/shacl.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" shacl.shacl %*
exit /B
diff --git a/apache-jena/bat/shex.bat b/apache-jena/bat/shex.bat
index 3c7d6e686e..6942fec959 100644
--- a/apache-jena/bat/shex.bat
+++ b/apache-jena/bat/shex.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
java %JVM_ARGS% -Dlog4j.configurationFile="%LOGGING%" -cp "%JENA_CP%" shex.shex %*
exit /B
diff --git a/apache-jena/bat/sparql.bat b/apache-jena/bat/sparql.bat
index a02998428a..914211d49d 100644
--- a/apache-jena/bat/sparql.bat
+++ b/apache-jena/bat/sparql.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 7177167b3c..c0d9c005e3 100644
--- a/apache-jena/bat/tdb2_tdbbackup.bat
+++ b/apache-jena/bat/tdb2_tdbbackup.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@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 7beb0763d2..e19a61a886 100644
--- a/apache-jena/bat/tdb2_tdbcompact.bat
+++ b/apache-jena/bat/tdb2_tdbcompact.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@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 70127e8aa8..bc9760775c 100644
--- a/apache-jena/bat/tdb2_tdbdump.bat
+++ b/apache-jena/bat/tdb2_tdbdump.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@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 73710044a6..6de9425305 100644
--- a/apache-jena/bat/tdb2_tdbloader.bat
+++ b/apache-jena/bat/tdb2_tdbloader.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@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 40ca010f54..02aa4219d2 100644
--- a/apache-jena/bat/tdb2_tdbquery.bat
+++ b/apache-jena/bat/tdb2_tdbquery.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@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 bd5691ef93..41dfdf226a 100644
--- a/apache-jena/bat/tdb2_tdbstats.bat
+++ b/apache-jena/bat/tdb2_tdbstats.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@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 cf6bb600c6..e65dc2cf8e 100644
--- a/apache-jena/bat/tdb2_tdbupdate.bat
+++ b/apache-jena/bat/tdb2_tdbupdate.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@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 5826424f4b..8ca8102c9a 100644
--- a/apache-jena/bat/tdbbackup.bat
+++ b/apache-jena/bat/tdbbackup.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 13ad8b11ea..926df26dbe 100644
--- a/apache-jena/bat/tdbdump.bat
+++ b/apache-jena/bat/tdbdump.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 122d883b30..c3666e1e10 100644
--- a/apache-jena/bat/tdbloader.bat
+++ b/apache-jena/bat/tdbloader.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 c3782c0fd4..4152c437dd 100644
--- a/apache-jena/bat/tdbquery.bat
+++ b/apache-jena/bat/tdbquery.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 50e6658dd7..9c4270f833 100644
--- a/apache-jena/bat/tdbstats.bat
+++ b/apache-jena/bat/tdbstats.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 5a585dedec..938a63d1bf 100644
--- a/apache-jena/bat/tdbupdate.bat
+++ b/apache-jena/bat/tdbupdate.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 09595f96b9..c1087761e3 100644
--- a/apache-jena/bat/trig.bat
+++ b/apache-jena/bat/trig.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 8440cb8850..045e74c51e 100644
--- a/apache-jena/bat/turtle.bat
+++ b/apache-jena/bat/turtle.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 e3c6fcd04f..4845335f07 100644
--- a/apache-jena/bat/uparse.bat
+++ b/apache-jena/bat/uparse.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 175a4009f9..68eb4ca930 100644
--- a/apache-jena/bat/update.bat
+++ b/apache-jena/bat/update.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 4b27142217..480caf64ec 100644
--- a/apache-jena/bat/utf8.bat
+++ b/apache-jena/bat/utf8.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 f803fe97e9..3c002bb9d4 100644
--- a/apache-jena/bat/wwwdec.bat
+++ b/apache-jena/bat/wwwdec.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 6f690dbc09..853daa9dff 100644
--- a/apache-jena/bat/wwwenc.bat
+++ b/apache-jena/bat/wwwenc.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 62a7e6baff..33b9141c4c 100755
--- a/apache-jena/bin/arq
+++ b/apache-jena/bin/arq
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.arq "$@"
diff --git a/apache-jena/bin/infer b/apache-jena/bin/infer
index 60e753dc31..6bb4885d4a 100755
--- a/apache-jena/bin/infer
+++ b/apache-jena/bin/infer
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.infer "$@"
diff --git a/apache-jena/bin/iri b/apache-jena/bin/iri
index 4074aeb46b..5ca1518d92 100755
--- a/apache-jena/bin/iri
+++ b/apache-jena/bin/iri
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.iri "$@"
diff --git a/apache-jena/bin/jena.version b/apache-jena/bin/jena.version
index 31793580bd..2b6fe3c704 100755
--- a/apache-jena/bin/jena.version
+++ b/apache-jena/bin/jena.version
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.version "$@"
diff --git a/apache-jena/bin/juuid b/apache-jena/bin/juuid
index e61f83b362..97d7d7251d 100755
--- a/apache-jena/bin/juuid
+++ b/apache-jena/bin/juuid
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.juuid "$@"
diff --git a/apache-jena/bin/nquads b/apache-jena/bin/nquads
index 6ff1bc55fa..25b1850e36 100755
--- a/apache-jena/bin/nquads
+++ b/apache-jena/bin/nquads
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.nquads "$@"
diff --git a/apache-jena/bin/ntriples b/apache-jena/bin/ntriples
index 00b3019110..a5917e05f1 100755
--- a/apache-jena/bin/ntriples
+++ b/apache-jena/bin/ntriples
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.ntriples "$@"
diff --git a/apache-jena/bin/qparse b/apache-jena/bin/qparse
index 64c91a1680..6a542c330d 100755
--- a/apache-jena/bin/qparse
+++ b/apache-jena/bin/qparse
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.qparse "$@"
diff --git a/apache-jena/bin/rdfcat b/apache-jena/bin/rdfcat
index f7a8c4f119..5343a995aa 100755
--- a/apache-jena/bin/rdfcat
+++ b/apache-jena/bin/rdfcat
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfcat "$@"
diff --git a/apache-jena/bin/rdfcompare b/apache-jena/bin/rdfcompare
index 39fdb8928c..1c58dc8e98 100755
--- a/apache-jena/bin/rdfcompare
+++ b/apache-jena/bin/rdfcompare
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfcompare "$@"
diff --git a/apache-jena/bin/rdfcopy b/apache-jena/bin/rdfcopy
index 384971cd51..5c83196eb7 100755
--- a/apache-jena/bin/rdfcopy
+++ b/apache-jena/bin/rdfcopy
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfcopy "$@"
diff --git a/apache-jena/bin/rdfdiff b/apache-jena/bin/rdfdiff
index 63ac26f24b..276386bd49 100755
--- a/apache-jena/bin/rdfdiff
+++ b/apache-jena/bin/rdfdiff
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rdfdiff "$@"
diff --git a/apache-jena/bin/rdfparse b/apache-jena/bin/rdfparse
index 61111c8cf6..fcac3ca72e 100755
--- a/apache-jena/bin/rdfparse
+++ b/apache-jena/bin/rdfparse
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.rdfparse "$@"
diff --git a/apache-jena/bin/rdfpatch b/apache-jena/bin/rdfpatch
index a308c6de9b..d80452b746 100755
--- a/apache-jena/bin/rdfpatch
+++ b/apache-jena/bin/rdfpatch
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" rdfpatch.rdfpatch "$@"
diff --git a/apache-jena/bin/rdfxml b/apache-jena/bin/rdfxml
index 46b25bfa9a..f419929fe1 100755
--- a/apache-jena/bin/rdfxml
+++ b/apache-jena/bin/rdfxml
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.rdfxml "$@"
diff --git a/apache-jena/bin/riot b/apache-jena/bin/riot
index 828a50658f..a876b4b308 100755
--- a/apache-jena/bin/riot
+++ b/apache-jena/bin/riot
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.riot "$@"
diff --git a/apache-jena/bin/rset b/apache-jena/bin/rset
index 0ec6d4a0a2..764ca8ea32 100755
--- a/apache-jena/bin/rset
+++ b/apache-jena/bin/rset
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rset "$@"
diff --git a/apache-jena/bin/rsparql b/apache-jena/bin/rsparql
index ab82472cea..ffd217ed88 100755
--- a/apache-jena/bin/rsparql
+++ b/apache-jena/bin/rsparql
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rsparql "$@"
diff --git a/apache-jena/bin/rupdate b/apache-jena/bin/rupdate
index 27538a3add..599f9562bd 100755
--- a/apache-jena/bin/rupdate
+++ b/apache-jena/bin/rupdate
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.rupdate "$@"
diff --git a/apache-jena/bin/schemagen b/apache-jena/bin/schemagen
index c5e334ebb3..3ccae45eb1 100755
--- a/apache-jena/bin/schemagen
+++ b/apache-jena/bin/schemagen
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" jena.schemagen "$@"
diff --git a/apache-jena/bin/shacl b/apache-jena/bin/shacl
index 5c109a0a6d..4d743d47c6 100755
--- a/apache-jena/bin/shacl
+++ b/apache-jena/bin/shacl
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" shacl.shacl "$@"
diff --git a/apache-jena/bin/shex b/apache-jena/bin/shex
index 67877cd2c3..c214b69583 100755
--- a/apache-jena/bin/shex
+++ b/apache-jena/bin/shex
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" shex.shex "$@"
diff --git a/apache-jena/bin/sparql b/apache-jena/bin/sparql
index 41efb732cd..7954455375 100755
--- a/apache-jena/bin/sparql
+++ b/apache-jena/bin/sparql
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+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 6df5614015..a9a4e4b459 100755
--- a/apache-jena/bin/tdb2.tdbbackup
+++ b/apache-jena/bin/tdb2.tdbbackup
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+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 1ad330eee1..cdce882b6f 100755
--- a/apache-jena/bin/tdb2.tdbcompact
+++ b/apache-jena/bin/tdb2.tdbcompact
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+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 b951a9d83d..2bf5399a0e 100755
--- a/apache-jena/bin/tdb2.tdbdump
+++ b/apache-jena/bin/tdb2.tdbdump
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+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 85a930b879..8fb3048358 100755
--- a/apache-jena/bin/tdb2.tdbloader
+++ b/apache-jena/bin/tdb2.tdbloader
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+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 db410bbc79..eeed824fa3 100755
--- a/apache-jena/bin/tdb2.tdbquery
+++ b/apache-jena/bin/tdb2.tdbquery
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+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 acd2554336..ebd344f9b0 100644
--- a/apache-jena/bin/tdb2.tdbstats
+++ b/apache-jena/bin/tdb2.tdbstats
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+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 69c8ca1c4d..08244397fe 100755
--- a/apache-jena/bin/tdb2.tdbupdate
+++ b/apache-jena/bin/tdb2.tdbupdate
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb2.tdbupdate "$@"
diff --git a/apache-jena/bin/tdbbackup b/apache-jena/bin/tdbbackup
index 3d14ea0c2f..31be3c4f71 100755
--- a/apache-jena/bin/tdbbackup
+++ b/apache-jena/bin/tdbbackup
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbbackup "$@"
diff --git a/apache-jena/bin/tdbdump b/apache-jena/bin/tdbdump
index 3abe21a244..7e8cc0a4ed 100755
--- a/apache-jena/bin/tdbdump
+++ b/apache-jena/bin/tdbdump
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbdump "$@"
diff --git a/apache-jena/bin/tdbloader b/apache-jena/bin/tdbloader
index c327c93321..080a7d1b54 100755
--- a/apache-jena/bin/tdbloader
+++ b/apache-jena/bin/tdbloader
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbloader "$@"
diff --git a/apache-jena/bin/tdbquery b/apache-jena/bin/tdbquery
index 5f661a7dc2..e331b64fc3 100755
--- a/apache-jena/bin/tdbquery
+++ b/apache-jena/bin/tdbquery
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbquery "$@"
diff --git a/apache-jena/bin/tdbstats b/apache-jena/bin/tdbstats
index 5818a715be..c7e9f1e254 100755
--- a/apache-jena/bin/tdbstats
+++ b/apache-jena/bin/tdbstats
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbstats "$@"
diff --git a/apache-jena/bin/tdbupdate b/apache-jena/bin/tdbupdate
index dd67fb25c5..9c709f6746 100755
--- a/apache-jena/bin/tdbupdate
+++ b/apache-jena/bin/tdbupdate
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" tdb.tdbupdate "$@"
diff --git a/apache-jena/bin/trig b/apache-jena/bin/trig
index 6156e738e6..54f35b9e9c 100755
--- a/apache-jena/bin/trig
+++ b/apache-jena/bin/trig
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.trig "$@"
diff --git a/apache-jena/bin/turtle b/apache-jena/bin/turtle
index 375b653576..bad7fdb41a 100755
--- a/apache-jena/bin/turtle
+++ b/apache-jena/bin/turtle
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.turtle "$@"
diff --git a/apache-jena/bin/uparse b/apache-jena/bin/uparse
index 314ab2985c..86045e0513 100755
--- a/apache-jena/bin/uparse
+++ b/apache-jena/bin/uparse
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.uparse "$@"
diff --git a/apache-jena/bin/update b/apache-jena/bin/update
index dbca96ada0..3a484427e8 100755
--- a/apache-jena/bin/update
+++ b/apache-jena/bin/update
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.update "$@"
diff --git a/apache-jena/bin/utf8 b/apache-jena/bin/utf8
index e4349f192f..b9ef488a77 100755
--- a/apache-jena/bin/utf8
+++ b/apache-jena/bin/utf8
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" riotcmd.utf8 "$@"
diff --git a/apache-jena/bin/wwwdec b/apache-jena/bin/wwwdec
index 6efcb4b568..c3345750c0 100755
--- a/apache-jena/bin/wwwdec
+++ b/apache-jena/bin/wwwdec
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.wwwdec "$@"
diff --git a/apache-jena/bin/wwwenc b/apache-jena/bin/wwwenc
index b69c303ae3..5cb9a38267 100755
--- a/apache-jena/bin/wwwenc
+++ b/apache-jena/bin/wwwenc
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" arq.wwwenc "$@"
diff --git a/apache-jena/template.bat b/apache-jena/template.bat
index 51a50d7783..a3e83d2363 100644
--- a/apache-jena/template.bat
+++ b/apache-jena/template.bat
@@ -13,6 +13,10 @@ exit /B
set JENA_CP=%JENA_HOME%\lib\*;
set LOGGING=file:%JENA_HOME%/log4j2.properties
+if "%CLASSPATH%" == "" goto :noExtra
+set JENA_CP="%JENA_CP%:%CLASSPATH%"
+:noExtra
+
@rem JVM_ARGS comes from the environment.
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 42e7dc7e83..84a99f10f3 100644
--- a/apache-jena/template.bin
+++ b/apache-jena/template.bin
@@ -87,6 +87,7 @@ fi
# JVM_ARGS : don't set here but it can be set in the environment.
# Expand JENA_HOME but literal *
JENA_CP="$JENA_HOME"'/lib/*'
+
LOGGING="${LOGGING:--Dlog4j.configurationFile=file:$JENA_HOME/log4j2.properties}"
# Platform specific fixup
@@ -105,4 +106,10 @@ then
JVM_ARGS="$JVM_ARGS -Djava.io.tmpdir=\"$TMP\""
fi
-"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP:$CLASSPATH" JENA_CMD "$@"
+## Append any custom classpath
+if [ -n "$CLASSPATH" ]
+then
+ JENA_CP="$JENA_CP:$CLASSPATH"
+fi
+
+"$JAVA" $JVM_ARGS $LOGGING -cp "$JENA_CP" JENA_CMD "$@"