logging-log4j2 git commit: Clean ups.

2017-08-17 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 889232e28 -> b004f81ee


Clean ups.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b004f81e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b004f81e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b004f81e

Branch: refs/heads/master
Commit: b004f81ee954f6108f9f2fbb541cc481be87f5d0
Parents: 889232e
Author: Gary Gregory 
Authored: Thu Aug 17 16:33:30 2017 -0600
Committer: Gary Gregory 
Committed: Thu Aug 17 16:33:30 2017 -0600

--
 .../logging/log4j/core/net/ssl/StoreConfiguration.java   | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b004f81e/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
index 044e060..47dea1d 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java
@@ -31,7 +31,7 @@ public class StoreConfiguration {
 
 public StoreConfiguration(final String location, final char[] password) {
 this.location = location;
-this.password = password == null ? null : password;
+this.password = password;
 }
 
 /**
@@ -39,8 +39,10 @@ public class StoreConfiguration {
  */
 public void clearSecrets() {
 this.location = null;
-Arrays.fill(password, Character.MIN_VALUE);
-this.password = null;
+if (password != null) {
+Arrays.fill(password, Character.MIN_VALUE);
+this.password = null;
+}
 }
 
 /**

[17/20] logging-log4j2 git commit: Clean ups.

2016-06-29 Thread mikes 
Clean ups.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a57ac9fd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a57ac9fd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a57ac9fd

Branch: refs/heads/LOG4J-1181
Commit: a57ac9fd3ba5d18243e3c6a13ec793fa984386fc
Parents: 8455935
Author: Gary Gregory 
Authored: Tue Jun 28 19:55:20 2016 -0700
Committer: Gary Gregory 
Committed: Tue Jun 28 19:55:20 2016 -0700

--
 .../core/appender/rolling/RollingAppenderUncompressedTest.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a57ac9fd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
index 797344d..e41741f 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.junit.CleanFolders;
@@ -39,7 +40,7 @@ public class RollingAppenderUncompressedTest {
 private static final String CONFIG = "log4j-rolling4.xml";
 private static final String DIR = "target/rolling4";
 
-org.apache.logging.log4j.Logger logger = 
LogManager.getLogger(RollingAppenderUncompressedTest.class.getName());
+private Logger logger = 
LogManager.getLogger(RollingAppenderUncompressedTest.class.getName());
 
 @ClassRule
 public static CleanFolders rule = new CleanFolders(CONFIG);

[16/17] logging-log4j2 git commit: Clean ups.

2016-06-28 Thread ggregory 
Clean ups.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a57ac9fd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a57ac9fd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a57ac9fd

Branch: refs/heads/StyledMessage
Commit: a57ac9fd3ba5d18243e3c6a13ec793fa984386fc
Parents: 8455935
Author: Gary Gregory 
Authored: Tue Jun 28 19:55:20 2016 -0700
Committer: Gary Gregory 
Committed: Tue Jun 28 19:55:20 2016 -0700

--
 .../core/appender/rolling/RollingAppenderUncompressedTest.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a57ac9fd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
index 797344d..e41741f 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.junit.CleanFolders;
@@ -39,7 +40,7 @@ public class RollingAppenderUncompressedTest {
 private static final String CONFIG = "log4j-rolling4.xml";
 private static final String DIR = "target/rolling4";
 
-org.apache.logging.log4j.Logger logger = 
LogManager.getLogger(RollingAppenderUncompressedTest.class.getName());
+private Logger logger = 
LogManager.getLogger(RollingAppenderUncompressedTest.class.getName());
 
 @ClassRule
 public static CleanFolders rule = new CleanFolders(CONFIG);

logging-log4j2 git commit: Clean ups.

2016-06-28 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 845593526 -> a57ac9fd3


Clean ups.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a57ac9fd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a57ac9fd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a57ac9fd

Branch: refs/heads/master
Commit: a57ac9fd3ba5d18243e3c6a13ec793fa984386fc
Parents: 8455935
Author: Gary Gregory 
Authored: Tue Jun 28 19:55:20 2016 -0700
Committer: Gary Gregory 
Committed: Tue Jun 28 19:55:20 2016 -0700

--
 .../core/appender/rolling/RollingAppenderUncompressedTest.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a57ac9fd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
index 797344d..e41741f 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderUncompressedTest.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue;
 import java.io.File;
 
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.junit.CleanFolders;
@@ -39,7 +40,7 @@ public class RollingAppenderUncompressedTest {
 private static final String CONFIG = "log4j-rolling4.xml";
 private static final String DIR = "target/rolling4";
 
-org.apache.logging.log4j.Logger logger = 
LogManager.getLogger(RollingAppenderUncompressedTest.class.getName());
+private Logger logger = 
LogManager.getLogger(RollingAppenderUncompressedTest.class.getName());
 
 @ClassRule
 public static CleanFolders rule = new CleanFolders(CONFIG);

logging-log4j2 git commit: Clean ups: Javadoc, make ivars final, add accessors.

2016-02-13 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 95717ca85 -> f5622d51d


Clean ups: Javadoc, make ivars final, add accessors.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f5622d51
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f5622d51
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f5622d51

Branch: refs/heads/master
Commit: f5622d51d164b51dc4d1e40ae1c7a3762de329ee
Parents: 95717ca
Author: ggregory 
Authored: Sat Feb 13 15:26:25 2016 -0800
Committer: ggregory 
Committed: Sat Feb 13 15:26:25 2016 -0800

--
 .../log4j/message/AbstractMessageFactory.java   | 44 ++--
 1 file changed, 32 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f5622d51/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
--
diff --git 
a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
 
b/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
index a3eb583..2df4302 100644
--- 
a/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
+++ 
b/log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java
@@ -34,18 +34,19 @@ public abstract class AbstractMessageFactory implements 
MessageFactory, Serializ
 }
 
 /**
- * Constructs an AbstractMessageFactory with the given entry and exit 
strings.
- * @param entryText the text to use for trace entry, like "entry".
- * @param exitText the text to use for trace exit, like "exit".
+ * Constructs a message factory with the given entry and exit strings.
+ * @param entryText the text to use for trace entry, like {@code "entry"} 
or {@code "Enter"}.
+ * @param exitText the text to use for trace exit, like {@code "exit"} or 
{@code "Exit"}.
+ * @since 2.6
  */
-public AbstractMessageFactory(String entryText, String exitText) {
+public AbstractMessageFactory(final String entryText, final String 
exitText) {
 super();
 this.entryText = entryText;
 this.exitText = exitText;
 }
 
-private String entryText;
-private String exitText;
+private final String entryText;
+private final String exitText;
 
 private static class AbstractFlowMessage extends AbstractMessage 
implements FlowMessage {
 
@@ -105,7 +106,7 @@ public abstract class AbstractMessageFactory implements 
MessageFactory, Serializ
 
 private static final long serialVersionUID = 1L;
 
-SimpleEntryMessage(String entryText, final Message message) {
+SimpleEntryMessage(final String entryText, final Message message) {
 super(entryText, message);
 }
 
@@ -118,13 +119,13 @@ public abstract class AbstractMessageFactory implements 
MessageFactory, Serializ
 private final Object result;
 private final boolean isVoid;
 
-SimpleExitMessage(String exitText, final Object result, final 
EntryMessage message) {
+SimpleExitMessage(final String exitText, final Object result, final 
EntryMessage message) {
 super(exitText, message.getMessage());
 this.result = result;
 isVoid = false;
 }
 
-SimpleExitMessage(String exitText, final Object result, final Message 
message) {
+SimpleExitMessage(final String exitText, final Object result, final 
Message message) {
 super(exitText, message);
 this.result = result;
 isVoid = false;
@@ -142,13 +143,31 @@ public abstract class AbstractMessageFactory implements 
MessageFactory, Serializ
 
 private static final long serialVersionUID = 1L;
 
+/**
+ * Gets the entry text.
+ * @return the entry text.
+ * @since 2.6
+ */
+public String getEntryText() {
+return entryText;
+}
+
+/**
+ * Gets the exit text.
+ * @return the exit text.
+ * @since 2.6
+ */
+public String getExitText() {
+return exitText;
+}
+
 /*
  * (non-Javadoc)
  *
  * @see 
org.apache.logging.log4j.message.MessageFactory#newEntryMessage(org.apache.logging.log4j.message.Message)
  */
 @Override
-public EntryMessage newEntryMessage(Message message) {
+public EntryMessage newEntryMessage(final Message message) {
 return new SimpleEntryMessage(entryText, message);
 }
 
@@ -158,7 +177,7 @@ public abstract class AbstractMessageFactory implements 
MessageFactory, Serializ
  * @see 
org.apache.logging.log4j.message.MessageFactory#newEntryMessage(java.lang.Object,