You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2022/01/20 20:58:48 UTC
[logging-log4j2] branch master updated (9c9fe49 -> eee5148)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 9c9fe49 Add a delay if an ephemeral port has not been allocated yet.
new 78ce1f0 Fix `log4j-jakarta-web` service file (#723)
new eee5148 Fix log4j-jakarta-web service file #723.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
...itializer => jakarta.servlet.ServletContainerInitializer} | 0
.../log4j/web/Log4jServletContainerInitializerTest.java | 12 ++++++++++++
src/changes/changes.xml | 5 ++++-
3 files changed, 16 insertions(+), 1 deletion(-)
rename log4j-jakarta-web/src/main/resources/META-INF/services/{javax.servlet.ServletContainerInitializer => jakarta.servlet.ServletContainerInitializer} (100%)
[logging-log4j2] 01/02: Fix `log4j-jakarta-web` service file (#723)
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 78ce1f0d3fdba4205afeccd2d8e87faf32f3a01f
Author: ppkarwasz <pi...@karwasz.org>
AuthorDate: Thu Jan 20 21:54:41 2022 +0100
Fix `log4j-jakarta-web` service file (#723)
* Fixes service file
The META-INF/services file used the old 'javax' namespace, hence the
`ServletContainerInitializer` was never detected.
* Adds test
Although a regression on this issue is highly unlikely, this can be
tested.
Co-authored-by: Piotr P. Karwasz <pi...@copernik.pl>
---
...itializer => jakarta.servlet.ServletContainerInitializer} | 0
.../log4j/web/Log4jServletContainerInitializerTest.java | 12 ++++++++++++
2 files changed, 12 insertions(+)
diff --git a/log4j-jakarta-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/log4j-jakarta-web/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
similarity index 100%
rename from log4j-jakarta-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
rename to log4j-jakarta-web/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer
diff --git a/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java b/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java
index 003360d..114c592 100644
--- a/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java
+++ b/log4j-jakarta-web/src/test/java/org/apache/logging/log4j/web/Log4jServletContainerInitializerTest.java
@@ -18,9 +18,13 @@ package org.apache.logging.log4j.web;
import java.util.EnumSet;
import java.util.EventListener;
+import java.util.ServiceLoader;
+import java.util.stream.StreamSupport;
+
import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.ServletContainerInitializer;
import jakarta.servlet.ServletContext;
import org.apache.logging.log4j.util.Strings;
@@ -181,4 +185,12 @@ public class Log4jServletContainerInitializerTest {
assertNotNull(filterCaptor.getValue(), "The filter should not be null.");
assertSame(Log4jServletFilter.class, filterCaptor.getValue(), "The filter is not correct.");
}
+
+ @Test
+ public void testServiceIsDetected() {
+ ServiceLoader<ServletContainerInitializer> loader = ServiceLoader.load(ServletContainerInitializer.class);
+ final boolean found = StreamSupport.stream(loader.spliterator(), false)
+ .anyMatch(s -> s instanceof Log4jServletContainerInitializer);
+ assertTrue(found, "ServletContainerInitializer not found.");
+ }
}
[logging-log4j2] 02/02: Fix log4j-jakarta-web service file #723.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit eee514806a2ac4abb069d29b95861a429084e044
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 20 15:58:45 2022 -0500
Fix log4j-jakarta-web service file #723.
---
src/changes/changes.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index fb210be..22740ae 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -275,7 +275,7 @@
<action dev="ggregory" type="fix" due-to="Gary Gregory">
Log4j 1.2 bridge now logs a warning instead of throwing an NullPointerException when building a Syslog appender with a missing "SyslogHost" param.
</action>
- <action dev="ggregory" type="fix" due-to="Gary Gregory, ppkarwasz">
+ <action dev="ggregory" type="fix" due-to="Gary Gregory, Piotr P. Karwasz">
Log4j 1.2 bridge should allow property and XML attributes to start with either an upper-case or lower-case letter.
</action>
<action dev="ggregory" type="fix" issue="LOG4J2-3330" due-to="Mircea Lemnaru, Gary Gregory">
@@ -284,6 +284,9 @@
<action dev="ggregory" type="fix">
Fix DTD error: Add missing ELEMENT for Marker.
</action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory, Piotr P. Karwasz">
+ Fix log4j-jakarta-web service file #723.
+ </action>
<!-- ADD -->
<action issue="LOG4J2-3303" dev="vy" type="add" due-to="ramananravi">
Add TB support to FileSize.