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/13 15:04:16 UTC
[logging-log4j2] branch master updated (ebcadcc -> e74fe91)
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 ebcadcc Simplify exception handling.
new ef3112c Remove unused exception.
new f0b3ae9 Fix DTD error: Add missing ELEMENT for Marker.
new e74fe91 Fix DTD error: Add missing ELEMENT for Marker.
The 3 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:
.../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java | 9 +++------
log4j-core/src/main/resources/Log4j-events.dtd | 1 +
src/changes/changes.xml | 3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
[logging-log4j2] 03/03: Fix DTD error: Add missing ELEMENT for Marker.
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 e74fe918a5809146667608ec3198fa1d98dd2a5b
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 10:03:57 2022 -0500
Fix DTD error: Add missing ELEMENT for Marker.
---
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 23994ed..20b8e83 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -269,6 +269,9 @@
<action dev="ggregory" type="fix" issue="LOG4J2-3330" due-to="Mircea Lemnaru, Gary Gregory">
Configurator.setLevel not fetching the correct LoggerContext.
</action>
+ <action dev="ggregory" type="fix">
+ Fix DTD error: Add missing ELEMENT for Marker.
+ </action>
<!-- ADD -->
<action issue="LOG4J2-3282" dev="ckozak" type="add" due-to="Michael Vorburger">
Add the log4j-to-jul JDK Logging Bridge
[logging-log4j2] 01/03: Remove unused exception.
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 ef3112c50e59d1c60491080df90b50b3d9e1ad13
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 09:39:06 2022 -0500
Remove unused exception.
---
.../src/main/java/org/apache/logging/log4j/util/LoaderUtil.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
index 6794430..b329121 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LoaderUtil.java
@@ -267,13 +267,12 @@ public final class LoaderUtil {
* @throws ClassNotFoundException if the class isn't available to the usual ClassLoaders
* @throws IllegalAccessException if the class can't be instantiated through a public constructor
* @throws InstantiationException if there was an exception whilst instantiating the class
- * @throws NoSuchMethodException if there isn't a no-args constructor on the class
* @throws InvocationTargetException if there was an exception whilst constructing the class
* @since 2.1
*/
@SuppressWarnings("unchecked")
public static <T> T newInstanceOf(final String className) throws ClassNotFoundException, IllegalAccessException,
- InstantiationException, NoSuchMethodException, InvocationTargetException {
+ InstantiationException, InvocationTargetException {
return newInstanceOf((Class<T>) loadClass(className));
}
@@ -287,13 +286,12 @@ public final class LoaderUtil {
* @throws ClassNotFoundException if the class isn't available to the usual ClassLoaders
* @throws IllegalAccessException if the class can't be instantiated through a public constructor
* @throws InstantiationException if there was an exception whilst instantiating the class
- * @throws NoSuchMethodException if there isn't a no-args constructor on the class
* @throws InvocationTargetException if there was an exception whilst constructing the class
* @throws ClassCastException if the constructed object isn't type compatible with {@code T}
* @since 2.1
*/
public static <T> T newCheckedInstanceOf(final String className, final Class<T> clazz)
- throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException,
+ throws ClassNotFoundException, InvocationTargetException, InstantiationException,
IllegalAccessException {
return newInstanceOf(loadClass(className).asSubclass(clazz));
}
@@ -308,13 +306,12 @@ public final class LoaderUtil {
* @throws ClassNotFoundException if the class isn't available to the usual ClassLoaders
* @throws IllegalAccessException if the class can't be instantiated through a public constructor
* @throws InstantiationException if there was an exception whilst instantiating the class
- * @throws NoSuchMethodException if there isn't a no-args constructor on the class
* @throws InvocationTargetException if there was an exception whilst constructing the class
* @throws ClassCastException if the constructed object isn't type compatible with {@code T}
* @since 2.5
*/
public static <T> T newCheckedInstanceOfProperty(final String propertyName, final Class<T> clazz)
- throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, InstantiationException,
+ throws ClassNotFoundException, InvocationTargetException, InstantiationException,
IllegalAccessException {
final String className = PropertiesUtil.getProperties().getStringProperty(propertyName);
if (className == null) {
[logging-log4j2] 02/03: Fix DTD error: Add missing ELEMENT for Marker.
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 f0b3ae9cc3b6d1dd1b8576e2797d632da0f5dd10
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 09:53:58 2022 -0500
Fix DTD error: Add missing ELEMENT for Marker.
---
log4j-core/src/main/resources/Log4j-events.dtd | 1 +
1 file changed, 1 insertion(+)
diff --git a/log4j-core/src/main/resources/Log4j-events.dtd b/log4j-core/src/main/resources/Log4j-events.dtd
index 92bff1c..a7c6a22 100644
--- a/log4j-core/src/main/resources/Log4j-events.dtd
+++ b/log4j-core/src/main/resources/Log4j-events.dtd
@@ -53,6 +53,7 @@
>
<!ELEMENT %log4j..Message; ANY>
<!ELEMENT %log4j..NDC; ANY>
+<!ELEMENT %log4j..Marker; ANY>
<!ELEMENT %log4j..Throwable; ANY>
<!ELEMENT %log4j..LocationInfo; EMPTY>
<!ATTLIST %log4j..LocationInfo;