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 91cf1c9eda GH-2568: Rename log4j properties file for use in tests
91cf1c9eda is described below
commit 91cf1c9edae43040f6e644312967c1f0af81d3c0
Author: Andy Seaborne <[email protected]>
AuthorDate: Sat Jul 6 15:49:51 2024 +0100
GH-2568: Rename log4j properties file for use in tests
---
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
jena-cmds/src/test/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../main/java/org/apache/jena/fuseki/system/FusekiLogging.java | 8 ++++++--
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
.../test/resources/{log4j2.properties => log4j2-test.properties} | 0
26 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/jena-arq/src/test/resources/log4j2.properties
b/jena-arq/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-arq/src/test/resources/log4j2.properties
rename to jena-arq/src/test/resources/log4j2-test.properties
diff --git a/jena-base/src/test/resources/log4j2.properties
b/jena-base/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-base/src/test/resources/log4j2.properties
rename to jena-base/src/test/resources/log4j2-test.properties
diff --git a/jena-cmds/src/test/log4j2.properties
b/jena-cmds/src/test/log4j2-test.properties
similarity index 100%
rename from jena-cmds/src/test/log4j2.properties
rename to jena-cmds/src/test/log4j2-test.properties
diff --git a/jena-core/src/test/resources/log4j2.properties
b/jena-core/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-core/src/test/resources/log4j2.properties
rename to jena-core/src/test/resources/log4j2-test.properties
diff --git a/jena-db/jena-dboe-base/src/test/resources/log4j2.properties
b/jena-db/jena-dboe-base/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-db/jena-dboe-base/src/test/resources/log4j2.properties
rename to jena-db/jena-dboe-base/src/test/resources/log4j2-test.properties
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-test.properties
similarity index 100%
rename from jena-db/jena-dboe-index-test/src/test/resources/log4j2.properties
rename to jena-db/jena-dboe-index-test/src/test/resources/log4j2-test.properties
diff --git a/jena-db/jena-dboe-index/src/test/resources/log4j2.properties
b/jena-db/jena-dboe-index/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-db/jena-dboe-index/src/test/resources/log4j2.properties
rename to jena-db/jena-dboe-index/src/test/resources/log4j2-test.properties
diff --git a/jena-db/jena-dboe-storage/src/test/resources/log4j2.properties
b/jena-db/jena-dboe-storage/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-db/jena-dboe-storage/src/test/resources/log4j2.properties
rename to jena-db/jena-dboe-storage/src/test/resources/log4j2-test.properties
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-test.properties
similarity index 100%
rename from jena-db/jena-dboe-trans-data/src/test/resources/log4j2.properties
rename to jena-db/jena-dboe-trans-data/src/test/resources/log4j2-test.properties
diff --git a/jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties
b/jena-db/jena-dboe-transaction/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-db/jena-dboe-transaction/src/test/resources/log4j2.properties
rename to
jena-db/jena-dboe-transaction/src/test/resources/log4j2-test.properties
diff --git a/jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties
b/jena-extras/jena-commonsrdf/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-extras/jena-commonsrdf/src/test/resources/log4j2.properties
rename to jena-extras/jena-commonsrdf/src/test/resources/log4j2-test.properties
diff --git
a/jena-extras/jena-serviceenhancer/src/test/resources/log4j2.properties
b/jena-extras/jena-serviceenhancer/src/test/resources/log4j2-test.properties
similarity index 100%
rename from
jena-extras/jena-serviceenhancer/src/test/resources/log4j2.properties
rename to
jena-extras/jena-serviceenhancer/src/test/resources/log4j2-test.properties
diff --git
a/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
b/jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2.properties
rename to
jena-fuseki2/jena-fuseki-access/src/test/resources/log4j2-test.properties
diff --git
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java
index a94cc415a4..df6f31236a 100644
---
a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java
+++
b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/system/FusekiLogging.java
@@ -56,11 +56,15 @@ public class FusekiLogging
/**
* Places for the log4j properties file at (3).
- * This is not the standard, fixed classpath names used by log4j.
+ * This is different to the standard, fixed classpath names used by log4j,
+ * (log4j2.properties, log4j2.yaml, log4j2.json, log4j2.xml and "-test"
variants),
+ * some of which requite extra dependencies
+ *
* log4j2.properties, log4j2.yaml, log4j2.json, log4j2.xml
*/
private static final String[] resourcesForLog4jProperties = {
- "log4j2.properties"
+ "log4j2-test.properties","log4j2.properties",
+ "log4j2-test.xml", "log4j2.xml"
};
public static String envLogLoggingProperty = "FUSEKI_LOGLOGGING";
diff --git
a/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
b/jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2-test.properties
similarity index 100%
rename from
jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2.properties
rename to
jena-fuseki2/jena-fuseki-geosparql/src/test/resources/log4j2-test.properties
diff --git a/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
b/jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2.properties
rename to
jena-fuseki2/jena-fuseki-main/src/test/resources/log4j2-test.properties
diff --git
a/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
b/jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2.properties
rename to
jena-fuseki2/jena-fuseki-webapp/src/test/resources/log4j2-test.properties
diff --git a/jena-geosparql/src/test/resources/log4j2.properties
b/jena-geosparql/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-geosparql/src/test/resources/log4j2.properties
rename to jena-geosparql/src/test/resources/log4j2-test.properties
diff --git a/jena-integration-tests/src/test/resources/log4j2.properties
b/jena-integration-tests/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-integration-tests/src/test/resources/log4j2.properties
rename to jena-integration-tests/src/test/resources/log4j2-test.properties
diff --git a/jena-permissions/src/test/resources/log4j2.properties
b/jena-permissions/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-permissions/src/test/resources/log4j2.properties
rename to jena-permissions/src/test/resources/log4j2-test.properties
diff --git a/jena-rdfconnection/src/test/resources/log4j2.properties
b/jena-rdfconnection/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-rdfconnection/src/test/resources/log4j2.properties
rename to jena-rdfconnection/src/test/resources/log4j2-test.properties
diff --git a/jena-shacl/src/test/resources/log4j2.properties
b/jena-shacl/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-shacl/src/test/resources/log4j2.properties
rename to jena-shacl/src/test/resources/log4j2-test.properties
diff --git a/jena-shex/src/test/resources/log4j2.properties
b/jena-shex/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-shex/src/test/resources/log4j2.properties
rename to jena-shex/src/test/resources/log4j2-test.properties
diff --git a/jena-tdb1/src/test/resources/log4j2.properties
b/jena-tdb1/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-tdb1/src/test/resources/log4j2.properties
rename to jena-tdb1/src/test/resources/log4j2-test.properties
diff --git a/jena-tdb2/src/test/resources/log4j2.properties
b/jena-tdb2/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-tdb2/src/test/resources/log4j2.properties
rename to jena-tdb2/src/test/resources/log4j2-test.properties
diff --git a/jena-text/src/test/resources/log4j2.properties
b/jena-text/src/test/resources/log4j2-test.properties
similarity index 100%
rename from jena-text/src/test/resources/log4j2.properties
rename to jena-text/src/test/resources/log4j2-test.properties
