You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/05/05 05:27:33 UTC
[logging-log4j2] 12/12: LOG4J2-913 - Remove unneeded imports.
General cleanup
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a6004c91c834ff488324b0c6bd19017bc2fc70fd
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat May 4 22:13:44 2019 -0700
LOG4J2-913 - Remove unneeded imports. General cleanup
---
.../log4j/core/config/ConfigurationFactory.java | 1 -
.../log4j/core/config/ConfigurationSource.java | 1 -
.../config/builder/impl/BuiltConfiguration.java | 5 ----
.../config/composite/CompositeConfiguration.java | 4 ----
.../log4j/core/config/json/JsonConfiguration.java | 5 ----
.../log4j/core/config/xml/XmlConfiguration.java | 5 ----
.../core/net/ssl/SslConfigurationFactory.java | 26 ++++++++++----------
.../log4j/flume/appender/FlumeAvroManager.java | 2 --
.../src/site/markdown/index.md | 26 ++++++++++----------
.../README.md | 7 ++++--
src/site/markdown/manual/cloud.md | 6 ++++-
src/site/xdoc/manual/configuration.xml.vm | 28 +++++++++++-----------
12 files changed, 50 insertions(+), 66 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
index 4a68a63..c0f2b23 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java
@@ -40,7 +40,6 @@ import org.apache.logging.log4j.core.config.plugins.util.PluginType;
import org.apache.logging.log4j.core.lookup.Interpolator;
import org.apache.logging.log4j.core.lookup.StrSubstitutor;
import org.apache.logging.log4j.core.net.UrlConnectionFactory;
-import org.apache.logging.log4j.core.net.ssl.SslConfigurationFactory;
import org.apache.logging.log4j.core.util.AuthorizationProvider;
import org.apache.logging.log4j.core.util.BasicAuthorizationProvider;
import org.apache.logging.log4j.core.util.FileUtils;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index 759386f..e3d70b3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -33,7 +33,6 @@ import java.util.Objects;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.net.UrlConnectionFactory;
-import org.apache.logging.log4j.core.net.ssl.SslConfigurationFactory;
import org.apache.logging.log4j.core.util.FileUtils;
import org.apache.logging.log4j.core.util.Loader;
import org.apache.logging.log4j.core.util.Source;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
index 741859c..e45151a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/BuiltConfiguration.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.AbstractConfiguration;
import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.ConfigurationFileWatcher;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.Reconfigurable;
import org.apache.logging.log4j.core.config.builder.api.Component;
@@ -32,11 +31,7 @@ import org.apache.logging.log4j.core.config.plugins.util.PluginManager;
import org.apache.logging.log4j.core.config.plugins.util.PluginType;
import org.apache.logging.log4j.core.config.plugins.util.ResolverUtil;
import org.apache.logging.log4j.core.config.status.StatusConfiguration;
-import org.apache.logging.log4j.core.util.FileWatcher;
import org.apache.logging.log4j.core.util.Patterns;
-import org.apache.logging.log4j.core.util.Source;
-import org.apache.logging.log4j.core.util.Watcher;
-import org.apache.logging.log4j.core.util.WatcherFactory;
/**
* This is the general version of the Configuration created by the Builder. It may be extended to
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
index 2267639..c4324d0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.core.config.composite;
-import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.util.ArrayList;
@@ -29,18 +28,15 @@ import org.apache.logging.log4j.core.config.AbstractConfiguration;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.ConfigurationFileWatcher;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.Reconfigurable;
import org.apache.logging.log4j.core.config.plugins.util.ResolverUtil;
import org.apache.logging.log4j.core.config.status.StatusConfiguration;
-import org.apache.logging.log4j.core.util.FileWatcher;
import org.apache.logging.log4j.core.util.Loader;
import org.apache.logging.log4j.core.util.Patterns;
import org.apache.logging.log4j.core.util.Source;
import org.apache.logging.log4j.core.util.WatchManager;
import org.apache.logging.log4j.core.util.Watcher;
-import org.apache.logging.log4j.core.util.WatcherFactory;
import org.apache.logging.log4j.util.PropertiesUtil;
/**
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
index c9d7162..c41a032 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
@@ -33,18 +33,13 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.AbstractConfiguration;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.ConfigurationFileWatcher;
import org.apache.logging.log4j.core.config.LoggerConfig;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.Reconfigurable;
import org.apache.logging.log4j.core.config.plugins.util.PluginType;
import org.apache.logging.log4j.core.config.plugins.util.ResolverUtil;
import org.apache.logging.log4j.core.config.status.StatusConfiguration;
-import org.apache.logging.log4j.core.util.FileWatcher;
import org.apache.logging.log4j.core.util.Patterns;
-import org.apache.logging.log4j.core.util.Source;
-import org.apache.logging.log4j.core.util.Watcher;
-import org.apache.logging.log4j.core.util.WatcherFactory;
/**
* Creates a Node hierarchy from a JSON file.
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
index 0e5fa98..6a6c116 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
@@ -37,20 +37,15 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.AbstractConfiguration;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.ConfigurationFileWatcher;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.Reconfigurable;
import org.apache.logging.log4j.core.config.plugins.util.PluginType;
import org.apache.logging.log4j.core.config.plugins.util.ResolverUtil;
import org.apache.logging.log4j.core.config.status.StatusConfiguration;
import org.apache.logging.log4j.core.util.Closer;
-import org.apache.logging.log4j.core.util.FileWatcher;
import org.apache.logging.log4j.core.util.Loader;
import org.apache.logging.log4j.core.util.Patterns;
-import org.apache.logging.log4j.core.util.Source;
import org.apache.logging.log4j.core.util.Throwables;
-import org.apache.logging.log4j.core.util.Watcher;
-import org.apache.logging.log4j.core.util.WatcherFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationFactory.java
index d0a517d..f658ca5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/SslConfigurationFactory.java
@@ -28,19 +28,19 @@ public class SslConfigurationFactory {
private static final Logger LOGGER = StatusLogger.getLogger();
private static SslConfiguration sslConfiguration = null;
- private static final String trustStorelocation = "log4j2.trustStore.location";
- private static final String trustStorePassword = "log4j2.trustStore.password";
- private static final String trustStorePasswordFile = "log4j2.trustStore.passwordFile";
- private static final String trustStorePasswordEnvVar = "log4j2.trustStore.passwordEnvironmentVariable";
- private static final String trustStoreKeyStoreType = "log4j2.trustStore.keyStoreType";
- private static final String trustStoreKeyManagerFactoryAlgorithm = "log4j2.trustStore.keyManagerFactoryAlgorithm";
- private static final String keyStoreLocation = "log4j2.keyStore.location";
- private static final String keyStorePassword = "log4j2.keyStore.password";
- private static final String keyStorePasswordFile = "log4j2.keyStore.passwordFile";
- private static final String keyStorePasswordEnvVar = "log4j2.keyStore.passwordEnvironmentVariable";
- private static final String keyStoreType = "log4j2.keyStore.type";
- private static final String keyStoreKeyManagerFactoryAlgorithm = "log4j2.keyStore.keyManagerFactoryAlgorithm";
- private static final String verifyHostName = "log4j2.ssl.verifyHostName";
+ private static final String trustStorelocation = "log4j2.trustStoreLocation";
+ private static final String trustStorePassword = "log4j2.trustStorePassword";
+ private static final String trustStorePasswordFile = "log4j2.trustStorePasswordFile";
+ private static final String trustStorePasswordEnvVar = "log4j2.trustStorePasswordEnvironmentVariable";
+ private static final String trustStoreKeyStoreType = "log4j2.trustStoreKeyStoreType";
+ private static final String trustStoreKeyManagerFactoryAlgorithm = "log4j2.trustStoreKeyManagerFactoryAlgorithm";
+ private static final String keyStoreLocation = "log4j2.keyStoreLocation";
+ private static final String keyStorePassword = "log4j2.keyStorePassword";
+ private static final String keyStorePasswordFile = "log4j2.keyStorePasswordFile";
+ private static final String keyStorePasswordEnvVar = "log4j2.keyStorePasswordEnvironmentVariable";
+ private static final String keyStoreType = "log4j2.keyStoreType";
+ private static final String keyStoreKeyManagerFactoryAlgorithm = "log4j2.keyStoreKeyManagerFactoryAlgorithm";
+ private static final String verifyHostName = "log4j2.sslVerifyHostName";
static {
PropertiesUtil props = PropertiesUtil.getProperties();
diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
index d1767e5..a5ef5d5 100644
--- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
+++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAvroManager.java
@@ -16,7 +16,6 @@
*/
package org.apache.logging.log4j.flume.appender;
-import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@@ -25,7 +24,6 @@ import org.apache.flume.api.RpcClient;
import org.apache.flume.api.RpcClientFactory;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
import org.apache.logging.log4j.core.appender.ManagerFactory;
-import org.apache.logging.log4j.util.Timer;
/**
* Manager for FlumeAvroAppenders.
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/markdown/index.md b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/markdown/index.md
index a65bd01..bd6dd19 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/markdown/index.md
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/site/markdown/index.md
@@ -61,19 +61,19 @@ TLS can be enabled by adding the following system properties or defining them in
| Property | Optional or Default Value | Description |
| ------------- |-------|:-------------|
-| log4j2.trustStore.location | Optional | The location of the trust store. If not provided the default trust store will be used.|
-| log4j2.trustStore.password | Optional | Password needed to access the trust store. |
-| log4j2.trustStore.passwordFile | Optinoal | The location of a file that contains the password for the trust store. |
-| log4j2.trustStore.passwordEnvironmentVariable | Optional | The name of the environment variable that contains the trust store password. |
-| log4j2.trustStore.keyStoreType | Required if keystore location provided | The type of key store. |
-| log4j2.trustStore.keyManagerFactoryAlgorithm | Optional | Java cryptographic algorithm. |
-| log4j2.keyStore.location | Optional | The location of the key store. If not provided the default key store will be used.|
-| log4j2.keyStore.password | Optional | Password needed to access the key store. |
-| log4j2.keyStore.passwordFile | Optional | The location of a file that contains the password for the key store. |
-| log4j2.keyStore.passwordEnvironmentVariable | Optional | The name of the environment variable that contains the key store password.|
-| log4j2.keyStore.type | Required if trust store location provided. | The type of key store. |
-| log4j2.keyStore.keyManagerFactoryAlgorithm | Optional | Java cryptographic algorithm. |
-| log4j2.ssl.verifyHostName | false | true or false |
+| log4j2.trustStoreLocation | Optional | The location of the trust store. If not provided the default trust store will be used.|
+| log4j2.trustStorePassword | Optional | Password needed to access the trust store. |
+| log4j2.trustStorePasswordFile | Optinoal | The location of a file that contains the password for the trust store. |
+| log4j2.trustStorePasswordEnvironmentVariable | Optional | The name of the environment variable that contains the trust store password. |
+| log4j2.trustStoreKeyStoreType | Required if keystore location provided | The type of key store. |
+| log4j2.trustStoreKeyManagerFactoryAlgorithm | Optional | Java cryptographic algorithm. |
+| log4j2.keyStoreLocation | Optional | The location of the key store. If not provided the default key store will be used.|
+| log4j2.keyStorePassword | Optional | Password needed to access the key store. |
+| log4j2.keyStorePasswordFile | Optional | The location of a file that contains the password for the key store. |
+| log4j2.keyStorePasswordEnvironmentVariable | Optional | The name of the environment variable that contains the key store password.|
+| log4j2.keyStoreType | Required if trust store location provided. | The type of key store. |
+| log4j2.keyStoreKeyManagerFactoryAlgorithm | Optional | Java cryptographic algorithm. |
+| log4j2.sslVerifyHostName | false | true or false |
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md
index 3251015..ebe0617 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md
@@ -4,7 +4,8 @@ This application uses Spring Boot and reads the logging configuration from the c
project. The log4j2.xml file is located in the config-repo directory in that project.
This sample packages the application in a docker container that is packaged with rabbit-mq (to allow dynamic updates
-from Spring Cloud Config), fluent-bit (to test as a log forwarder), and Apache Flume (to test as a log forwarder).
+from Spring Cloud Config), fluent-bit (to test as a log forwarder), Apache Flume (to test as a log forwarder), and
+Apache Kafka also as a log forwarder. It also installs Socat, a proxy to allow access to the Docker REST API.
###Prerequisites
Note: This guide assumes you already have docker installed. If you do not you may either use homebrew to install
it or follow the instructions at https://docs.docker.com/docker-for-mac/install/.
@@ -29,5 +30,7 @@ zookeeper-server-start /usr/local/etc/kafka/zookeeper.properties & kafka-server-
###Viewing the logs
-Accessing the log files varies depending on the appending being used.
+Accessing the log files varies depending on the appending being used. When logging to the console "docker logs" may
+be used. As configured, Flume will write to files in /var/log/flume, fluent-bit to the standard output of its container.
+Kafka output may be viewed using a tool like [Kafka Tool](http://www.kafkatool.com/).
diff --git a/src/site/markdown/manual/cloud.md b/src/site/markdown/manual/cloud.md
index 53d78e2..fdde0f8 100644
--- a/src/site/markdown/manual/cloud.md
+++ b/src/site/markdown/manual/cloud.md
@@ -27,6 +27,10 @@ in Java applications include:
1. Java stack traces are multi-line log messages. The standard docker log driver cannot handle these properly. See
[Docker Issue #22920](https://github.com/moby/moby/issues/22920) which was closed with the message "Don't Care".
+Solutions for this are to:
+ a. Use a docker log driver that does support multi-line log message,
+ b. Use a logging format that does not produce multi-line messages,
+ c. Log from Log4j directly to a logging forwarder or aggregator and bypass the docker logging driver.
1. When logging to stdout in Docker, log events pass through Java's standard output handling which is then directed
to the operating system so that the output can be piped into a file. The overhead of all this is measurably slower
than just writing directly to a file as can be seen by the performance results below where logging
@@ -213,7 +217,7 @@ Log4j Docker Lookup to add the container information to each log event.
as the Kafka Appender with syncSend set to true that only return control after the downstream agent
acknowledges receipt of the event. Beware that using an Appender that writes each event individually should
be kept to a minimum since it is much slower than sending buffered events.
-1. Logging to files within the container is discouraged. Doing so reuires that a volume be declared in
+1. Logging to files within the container is discouraged. Doing so requires that a volume be declared in
the Docker configuration and that the file be tailed by a log forwarder. However, it performs
better than logging to the standard output stream. If logging via TCP is not an option and
proper multiline handling is required then consider this option.
\ No newline at end of file
diff --git a/src/site/xdoc/manual/configuration.xml.vm b/src/site/xdoc/manual/configuration.xml.vm
index e0291d7..0c7f60d 100644
--- a/src/site/xdoc/manual/configuration.xml.vm
+++ b/src/site/xdoc/manual/configuration.xml.vm
@@ -2387,79 +2387,79 @@ public class AwesomeTest {
This is equivalent to defining all message patterns using <tt>%m{nolookups}</tt>.</td>
</tr>
<tr>
- <td><a name="log4j2.trustStore.location "/>log4j2.trustStore.location</td>
+ <td><a name="log4j2.trustStoreLocation "/>log4j2.trustStoreLocation</td>
<td>LOG4J_TRUST_STORE_LOCATION</td>
<td></td>
<td>The location of the trust store. If not provided the default trust store will be used.</td>
</tr>
<tr>
- <td><a name="log4j2.trustStore.password"/>log4j2.trustStore.password</td>
+ <td><a name="log4j2.trustStorePassword"/>log4j2.trustStorePassword</td>
<td>LOG4J_TRUST_STORE_PASSWORD</td>
<td></td>
<td>Password needed to access the trust store.</td>
</tr>
<tr>
- <td><a name="log4j2.trustStore.passwordFile"/>log4j2.trustStore.passwordFile</td>
+ <td><a name="log4j2.trustStorePasswordFile"/>log4j2.trustStorePasswordFile</td>
<td>LOG4J_TRUST_STORE_PASSWORD_FILE</td>
<td></td>
<td>The location of a file that contains the password for the trust store.</td>
</tr>
<tr>
- <td><a name="log4j2.trustStore.passwordEnvironmentVariable"/>log4j2.trustStore.passwordEnvironmentVariable</td>
+ <td><a name="log4j2.trustStorePasswordEnvironmentVariable"/>log4j2.trustStorePasswordEnvironmentVariable</td>
<td>LOG4J_TRUST_STORE_PASSWORD_ENVIRONMENT_VARIABLE</td>
<td></td>
<td>The name of the environment variable that contains the trust store password.</td>
</tr>
<tr>
- <td><a name="log4j2.trustStore.type"/>log4j2.trustStore.type</td>
+ <td><a name="log4j2.trustStoreType"/>log4j2.trustStoreType</td>
<td>LOG4J_TRUST_STORE_TYPE</td>
<td></td>
<td>The type of key store used for the trust store.</td>
</tr>
<tr>
- <td><a name="log4j2.trustStore.keyManagerFactoryAlgorithm"/>log4j2.trustStore.keyManagerFactoryAlgorithm</td>
+ <td><a name="log4j2.trustStoreKeyManagerFactoryAlgorithm"/>log4j2.trustStoreKeyManagerFactoryAlgorithm</td>
<td>LOG4J_TRUST_STORE_KEY_MANAGER_FACTORY_ALGORITHM</td>
<td></td>
<td>Java cryptographic algorithm.</td>
</tr>
<tr>
- <td><a name="log4j2.keyStore.location "/>log4j2.keyStore.location </td>
+ <td><a name="log4j2.keyStoreLocation "/>log4j2.keyStoreLocation </td>
<td>LOG4J_KEY_STORE_LOCATION</td>
<td></td>
<td>The location of the key store. If not provided the default key store will be used.</td>
</tr>
<tr>
- <td><a name="log4j2.keyStore.password"/>log4j2.keyStore.password</td>
+ <td><a name="log4j2.keyStorePassword"/>log4j2.keyStorePassword</td>
<td>LOG4J_KEY_STORE_PASSWORD</td>
<td></td>
<td>Password needed to access the key store.</td>
</tr>
<tr>
- <td><a name="log4j2.keyStore.passwordFile"/>log4j2.keyStore.passwordFile</td>
+ <td><a name="log4j2.keyStorePasswordFile"/>log4j2.keyStorePasswordFile</td>
<td>LOG4J_KEY_STORE_PASSWORD_FILE</td>
<td></td>
<td>The location of a file that contains the password for the key store.</td>
</tr>
<tr>
- <td><a name="log4j2.keyStore.passwordEnvironmentVariable"/>log4j2.keyStore.passwordEnvironmentVariable</td>
+ <td><a name="log4j2.keyStorePasswordEnvironmentVariable"/>log4j2.keyStorePasswordEnvironmentVariable</td>
<td>LOG4J_KEY_STORE_PASSWORD_ENVIRONMENT_VARIABLE</td>
<td></td>
<td>The name of the environment variable that contains the key store password.</td>
</tr>
<tr>
- <td><a name="log4j2.keyStore.type"/>log4j2.keyStore.type</td>
+ <td><a name="log4j2.keyStoreType"/>log4j2.keyStoreType</td>
<td>LOG4J_KEY_STORE_TYPE</td>
- <td></td>
+ <td></td>t
<td>The type of key store.</td>
</tr>
<tr>
- <td><a name="log4j2.keyStore.keyManagerFactoryAlgorithm"/>log4j2.keyStore.keyManagerFactoryAlgorithm</td>
+ <td><a name="log4j2.keyStoreKeyManagerFactoryAlgorithm"/>log4j2.keyStoreKeyManagerFactoryAlgorithm</td>
<td>LOG4J_KEY_STORE_KEY_MANAGER_FACTORY_ALGORITHM</td>
<td></td>
<td>Java cryptographic algorithm.</td>
</tr>
<tr>
- <td><a name="log4j2.ssl.verifyHostName"/>log4j2.ssl.verifyHostName</td>
+ <td><a name="log4j2.sslVerifyHostName"/>log4j2.sslVerifyHostName</td>
<td></td>
<td>false</td>
<td>true or false if the host name should be verified</td>