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 2021/12/30 14:03:29 UTC
[logging-log4j2] branch master updated (8c5ec9a -> 2d78c1b)
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 8c5ec9a Log4j 1.2 bridge class PatternLayout is missing constants DEFAULT_CONVERSION_PATTERN and TTCC_CONVERSION_PATTERN.
new 4e00657 Sort members.
new 02a3cb7 Add Javadoc.
new 2d78c1b Format Javadoc.
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:
.../org/apache/log4j/PropertyConfigurator.java | 72 +++++++++++-----------
.../java/org/apache/log4j/spi/Configurator.java | 38 +++++++-----
2 files changed, 58 insertions(+), 52 deletions(-)
[logging-log4j2] 02/03: Add Javadoc.
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 02a3cb797e4ba958253b0908557aeb7da5f44d03
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 30 09:00:25 2021 -0500
Add Javadoc.
---
.../src/main/java/org/apache/log4j/spi/Configurator.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
index 55d19da..180ea88 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
@@ -26,8 +26,16 @@ import org.apache.logging.log4j.core.LoggerContext;
*/
public interface Configurator {
+ /**
+ * Special level value signifying inherited behavior. The current value of this string constant is <b>inherited</b>.
+ * {@link #NULL} is a synonym.
+ */
public static final String INHERITED = "inherited";
+ /**
+ * Special level signifying inherited behavior, same as {@link #INHERITED}. The current value of this string constant
+ * is <b>null</b>.
+ */
public static final String NULL = "null";
[logging-log4j2] 03/03: Format Javadoc.
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 2d78c1bf0722f81e5bf36bd174843268865502f2
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 30 09:01:38 2021 -0500
Format Javadoc.
---
.../java/org/apache/log4j/spi/Configurator.java | 30 ++++++++++------------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
index 180ea88..cd9dee0 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/Configurator.java
@@ -40,26 +40,24 @@ public interface Configurator {
/**
- Interpret a resource pointed by a InputStream and set up log4j accordingly.
-
- The configuration is done relative to the <code>hierarchy</code>
- parameter.
-
- @param inputStream The InputStream to parse.
- @param loggerContext The LoggerContext.
-
- @since 1.2.17
+ * Interpret a resource pointed by a InputStream and set up log4j accordingly.
+ *
+ * The configuration is done relative to the <code>hierarchy</code> parameter.
+ *
+ * @param inputStream The InputStream to parse.
+ * @param loggerContext The LoggerContext.
+ *
+ * @since 1.2.17
*/
void doConfigure(InputStream inputStream, final LoggerContext loggerContext);
/**
- Interpret a resource pointed by a URL and set up log4j accordingly.
-
- The configuration is done relative to the <code>hierarchy</code>
- parameter.
-
- @param url The URL to parse
- @param loggerContext The LoggerContext.
+ * Interpret a resource pointed by a URL and set up log4j accordingly.
+ *
+ * The configuration is done relative to the <code>hierarchy</code> parameter.
+ *
+ * @param url The URL to parse
+ * @param loggerContext The LoggerContext.
*/
void doConfigure(URL url, final LoggerContext loggerContext);
}
[logging-log4j2] 01/03: Sort members.
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 4e00657623abfbba50d8701133d38038f8645c12
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Dec 30 08:55:12 2021 -0500
Sort members.
---
.../org/apache/log4j/PropertyConfigurator.java | 72 +++++++++++-----------
1 file changed, 36 insertions(+), 36 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
index 0fe1fe0..8f6ead4 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java
@@ -28,13 +28,11 @@ import org.apache.log4j.spi.LoggerRepository;
public class PropertyConfigurator {
/**
- * Read configuration options from configuration file.
+ * Reads configuration options from an InputStream.
*
- * @param configFileName The configuration file
- * @param hierarchy The hierarchy
+ * @param inputStream The input stream
*/
- public void doConfigure(final String configFileName, final LoggerRepository hierarchy) {
-
+ public static void configure(final InputStream inputStream) {
}
/**
@@ -43,51 +41,57 @@ public class PropertyConfigurator {
* See {@link #doConfigure(String, LoggerRepository)} for the expected format.
*
* @param properties The properties
- * @param hierarchy The hierarchy
*/
- public void doConfigure(final Properties properties, final LoggerRepository hierarchy) {
+ public static void configure(final Properties properties) {
}
/**
- * Read configuration options from an InputStream.
+ * Read configuration options from configuration file.
*
- * @param inputStream The input stream
- * @param hierarchy The hierarchy
+ * @param configFileName The configuration file.
*/
- public void doConfigure(final InputStream inputStream, final LoggerRepository hierarchy) {
+ public static void configure(final String configFileName) {
}
/**
* Read configuration options from url <code>configURL</code>.
*
* @param configURL The configuration URL
- * @param hierarchy The hierarchy
*/
- public void doConfigure(final URL configURL, final LoggerRepository hierarchy) {
+ public static void configure(final URL configURL) {
}
/**
- * Read configuration options from configuration file.
+ * Like {@link #configureAndWatch(String, long)} except that the
+ * default delay as defined by FileWatchdog.DEFAULT_DELAY is
+ * used.
*
- * @param configFileName The configuration file.
+ * @param configFilename A file in key=value format.
*/
- public static void configure(final String configFileName) {
+ public static void configureAndWatch(final String configFilename) {
}
/**
- * Read configuration options from url <code>configURL</code>.
+ * Read the configuration file <code>configFilename</code> if it
+ * exists. Moreover, a thread will be created that will periodically
+ * check if <code>configFilename</code> has been created or
+ * modified. The period is determined by the <code>delay</code>
+ * argument. If a change or file creation is detected, then
+ * <code>configFilename</code> is read to configure log4j.
*
- * @param configURL The configuration URL
+ * @param configFilename A file in key=value format.
+ * @param delay The delay in milliseconds to wait between each check.
*/
- public static void configure(final URL configURL) {
+ public static void configureAndWatch(final String configFilename, final long delay) {
}
/**
- * Reads configuration options from an InputStream.
+ * Read configuration options from an InputStream.
*
* @param inputStream The input stream
+ * @param hierarchy The hierarchy
*/
- public static void configure(final InputStream inputStream) {
+ public void doConfigure(final InputStream inputStream, final LoggerRepository hierarchy) {
}
/**
@@ -96,31 +100,27 @@ public class PropertyConfigurator {
* See {@link #doConfigure(String, LoggerRepository)} for the expected format.
*
* @param properties The properties
+ * @param hierarchy The hierarchy
*/
- public static void configure(final Properties properties) {
+ public void doConfigure(final Properties properties, final LoggerRepository hierarchy) {
}
/**
- * Like {@link #configureAndWatch(String, long)} except that the
- * default delay as defined by FileWatchdog.DEFAULT_DELAY is
- * used.
+ * Read configuration options from configuration file.
*
- * @param configFilename A file in key=value format.
+ * @param configFileName The configuration file
+ * @param hierarchy The hierarchy
*/
- public static void configureAndWatch(final String configFilename) {
+ public void doConfigure(final String configFileName, final LoggerRepository hierarchy) {
+
}
/**
- * Read the configuration file <code>configFilename</code> if it
- * exists. Moreover, a thread will be created that will periodically
- * check if <code>configFilename</code> has been created or
- * modified. The period is determined by the <code>delay</code>
- * argument. If a change or file creation is detected, then
- * <code>configFilename</code> is read to configure log4j.
+ * Read configuration options from url <code>configURL</code>.
*
- * @param configFilename A file in key=value format.
- * @param delay The delay in milliseconds to wait between each check.
+ * @param configURL The configuration URL
+ * @param hierarchy The hierarchy
*/
- public static void configureAndWatch(final String configFilename, final long delay) {
+ public void doConfigure(final URL configURL, final LoggerRepository hierarchy) {
}
}