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:01:42 UTC
[logging-log4j2] 01/03: Sort members.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 2fd374d97856ca6d6ef0807882466f9c14dcdfee
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) {
}
}