Repository: logging-log4j2 Updated Branches: refs/heads/master 898a2d9b5 -> 8d0b7bd06
Fix typo in varName and API name. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8d0b7bd0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8d0b7bd0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8d0b7bd0 Branch: refs/heads/master Commit: 8d0b7bd06d0f8c1bdfa65b5666bd0d9a74a0e029 Parents: 898a2d9 Author: Gary Gregory <[email protected]> Authored: Fri Jun 23 19:22:13 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Fri Jun 23 19:22:13 2017 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/mom/JmsAppender.java | 17 +++++++++++++---- .../log4j/core/appender/mom/JmsManager.java | 10 +++++----- 2 files changed, 18 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8d0b7bd0/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java index ee8a737..b91744e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsAppender.java @@ -115,7 +115,7 @@ public class JmsAppender extends AbstractAppender { private String destinationBindingName; @PluginBuilderAttribute - private String username; + private String userName; @PluginBuilderAttribute(sensitive = true) private String password; @@ -175,8 +175,17 @@ public class JmsAppender extends AbstractAppender { return this; } + /** + * @deprecated Use {@link #setUserName(String)}. + */ + @Deprecated public Builder setUsername(final String username) { - this.username = username; + this.userName = username; + return this; + } + + public Builder setUserName(final String userName) { + this.userName = userName; return this; } @@ -212,7 +221,7 @@ public class JmsAppender extends AbstractAppender { final JndiManager jndiManager = JndiManager.getJndiManager(factoryName, providerUrl, urlPkgPrefixes, securityPrincipalName, securityCredentials, null); actualJmsManager = JmsManager.getJmsManager(name, jndiManager, factoryBindingName, - destinationBindingName, username, password); + destinationBindingName, userName, password); } try { return new JmsAppender(name, filter, layout, ignoreExceptions, actualJmsManager); @@ -230,7 +239,7 @@ public class JmsAppender extends AbstractAppender { return "Builder [name=" + name + ", factoryName=" + factoryName + ", providerUrl=" + providerUrl + ", urlPkgPrefixes=" + urlPkgPrefixes + ", securityPrincipalName=" + securityPrincipalName + ", securityCredentials=" + securityCredentials + ", factoryBindingName=" + factoryBindingName - + ", destinationBindingName=" + destinationBindingName + ", username=" + username + ", layout=" + + ", destinationBindingName=" + destinationBindingName + ", username=" + userName + ", layout=" + layout + ", filter=" + filter + ", ignoreExceptions=" + ignoreExceptions + ", jmsManager=" + jmsManager + "]"; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8d0b7bd0/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java index d51dd7a..317400f 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/JmsManager.java @@ -177,15 +177,15 @@ public class JmsManager extends AbstractManager { private final JndiManager jndiManager; private final String connectionFactoryName; private final String destinationName; - private final String username; + private final String userName; private final String password; private JmsConfiguration(final JndiManager jndiManager, final String connectionFactoryName, final String destinationName, - final String username, final String password) { + final String userName, final String password) { this.jndiManager = jndiManager; this.connectionFactoryName = connectionFactoryName; this.destinationName = destinationName; - this.username = username; + this.userName = userName; this.password = password; } @@ -195,7 +195,7 @@ public class JmsManager extends AbstractManager { @Override public String toString() { return "JmsConfiguration [jndiManager=" + jndiManager + ", connectionFactoryName=" + connectionFactoryName - + ", destinationName=" + destinationName + ", username=" + username + "]"; + + ", destinationName=" + destinationName + ", username=" + userName + "]"; } } @@ -205,7 +205,7 @@ public class JmsManager extends AbstractManager { public JmsManager createManager(final String name, final JmsConfiguration data) { try { return new JmsManager(name, data.jndiManager, data.connectionFactoryName, data.destinationName, - data.username, data.password); + data.userName, data.password); } catch (final Exception e) { LOGGER.error("Error creating JmsManager using ConnectionFactory [{}] and Destination [{}].", data.connectionFactoryName, data.destinationName, e);
