[1/2] logging-log4j2 git commit: Replace String protocol method with type-safe enum Protocol.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 5a14032f2 -> fe4ace50c


Replace String protocol method with type-safe enum Protocol.

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

Branch: refs/heads/master
Commit: 9ef298b5c82471944ab3c5508578c5752e0e7f60
Parents: 1c786f6
Author: ggregory 
Authored: Wed Dec 2 07:52:39 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 07:52:39 2015 -0800

--
 .../org/apache/logging/log4j/core/appender/SocketAppenderTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9ef298b5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 150ae70..9a7f9d5 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -144,7 +144,7 @@ public class SocketAppenderTest {
 @Test
 public void testDefaultProtocol() throws Exception {
 
-final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, null, null, 0, "-1",
+final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, (Protocol) null, null, 0, "-1",
 "false", "Test", null, null, null, null, null, null);
 assertNotNull(appender);
 }

[2/2] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

2015-12-02 Thread ggregory 
Merge branch 'master' of 
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git

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

Branch: refs/heads/master
Commit: fe4ace50c91384ae6fc7c3314a5669aabb5db6ae
Parents: 9ef298b 5a14032
Author: ggregory 
Authored: Wed Dec 2 07:52:58 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 07:52:58 2015 -0800

--
 .../log4j/core/appender/HangingAppender.java| 29 ++--
 1 file changed, 27 insertions(+), 2 deletions(-)
--

[1/2] logging-log4j2 git commit: Javadoc tweak.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master fb5842a54 -> 358c4579b


Javadoc tweak.

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

Branch: refs/heads/master
Commit: 2566efa635d6930b9ba0b002689fc9aab9b5eb4f
Parents: fb5842a
Author: ggregory 
Authored: Wed Dec 2 08:18:04 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 08:18:04 2015 -0800

--
 .../logging/log4j/core/appender/AbstractOutputStreamAppender.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2566efa6/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 3e09a61..5720974 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -48,7 +48,7 @@ public abstract class AbstractOutputStreamAppenderos as its {@link java.io.OutputStream}.
  * 
  * @param name The name of the Appender.

[1/2] logging-log4j2 git commit: Format.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master fe4ace50c -> fb5842a54


Format.

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

Branch: refs/heads/master
Commit: f52b7bf20a3609ba9cd460326304f680b477
Parents: fe4ace5
Author: ggregory 
Authored: Wed Dec 2 07:56:03 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 07:56:03 2015 -0800

--
 .../org/apache/logging/log4j/core/appender/SocketAppender.java | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f52b7bf2/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 9b2ec0d..ba6774f 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -123,7 +123,8 @@ public class SocketAppender extends 
AbstractOutputStreamAppender layout,
 @PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise, 
@PluginConfiguration final Configuration config) {
+@PluginAttribute("advertise") final String advertise, 
+@PluginConfiguration final Configuration config) {
 // @formatter:on
 boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
 final boolean isAdvertise = Boolean.parseBoolean(advertise);
@@ -203,7 +204,8 @@ public class SocketAppender extends 
AbstractOutputStreamAppender layout,
 @PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise, 
@PluginConfiguration final Configuration config) {
+@PluginAttribute("advertise") final String advertise, 
+@PluginConfiguration final Configuration config) {
 // @formatter:on
 return createAppender(host, portNum, protocolIn, sslConfig, 
connectTimeoutMillis, delayMillis, immediateFail,
 name, immediateFlush, ignore, layout, filter, advertise, 
config);

[2/2] logging-log4j2 git commit: Encapsulate immediate flush.

2015-12-02 Thread ggregory 
Encapsulate immediate flush.

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

Branch: refs/heads/master
Commit: 358c4579bab52a15844a0f17f6e3b64cfdea880f
Parents: 2566efa
Author: ggregory 
Authored: Wed Dec 2 08:35:47 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 08:35:47 2015 -0800

--
 .../core/appender/AbstractOutputStreamAppender.java | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/358c4579/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 5720974..5ab28d5 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -40,7 +40,7 @@ public abstract class AbstractOutputStreamAppenderimmediateFlush is set to {@code false}, then there is a 
good chance that the last few logs events
  * are not actually written to persistent media if and when the 
application crashes.
  */
-protected final boolean immediateFlush;
+private final boolean immediateFlush;
 
 private final M manager;
 
@@ -63,6 +63,15 @@ public abstract class AbstractOutputStreamAppender

[2/2] logging-log4j2 git commit: Remove unused imports.

2015-12-02 Thread ggregory 
Remove unused imports.

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

Branch: refs/heads/master
Commit: fb5842a54134682d0411cb32489586c1cf5eaf97
Parents: f52b7bf
Author: ggregory 
Authored: Wed Dec 2 07:56:39 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 07:56:39 2015 -0800

--
 .../java/org/apache/logging/log4j/core/appender/SocketAppender.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fb5842a5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index ba6774f..89410c6 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -38,7 +38,6 @@ import org.apache.logging.log4j.core.net.SslSocketManager;
 import org.apache.logging.log4j.core.net.TcpSocketManager;
 import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
 import org.apache.logging.log4j.core.util.Booleans;
-import org.apache.logging.log4j.util.EnglishEnums;
 
 /**
  * An Appender that delivers events over socket connections. Supports both TCP 
and UDP.

logging-log4j2 git commit: New SocketAppender factory API is now type safe.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 358c4579b -> d49c49fd6


New SocketAppender factory API is now type safe.

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

Branch: refs/heads/master
Commit: d49c49fd65720f04c5d0c29c5747174697457e80
Parents: 358c457
Author: ggregory 
Authored: Wed Dec 2 09:21:11 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 09:21:11 2015 -0800

--
 .../log4j/core/appender/SocketAppender.java | 43 +---
 .../log4j/core/appender/SocketAppenderTest.java | 22 +-
 .../net/server/AbstractSocketServerTest.java| 10 ++---
 .../core/net/server/SslXmlSocketServerTest.java |  4 +-
 4 files changed, 37 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d49c49fd/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 89410c6..cda19e4 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -77,15 +77,15 @@ public class SocketAppender extends 
AbstractOutputStreamAppender layout,
 @PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise, 
+@PluginAttribute(value = "advertise", defaultBoolean = false) 
final boolean advertise, 
 @PluginConfiguration final Configuration config) {
 // @formatter:on
-boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
-final boolean isAdvertise = Boolean.parseBoolean(advertise);
-final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
-final boolean fail = Booleans.parseBoolean(immediateFail, true);
-final int reconnectDelayMillis = 
AbstractAppender.parseInt(delayMillis, 0);
-final int port = AbstractAppender.parseInt(portNum, 0);
+
 if (layout == null) {
 layout = SerializedLayout.createLayout();
 }
@@ -140,16 +135,16 @@ public class SocketAppender extends 
AbstractOutputStreamAppenderhttp://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d49c49fd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 9a7f9d5..87b06cb 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -57,9 +57,9 @@ public class SocketAppenderTest {
 private static final int PORTNUM1 = AvailablePortFinder.getNextAvailable();
 private static final int PORTNUM2 = AvailablePortFinder.getNextAvailable();
 
-private static final String PORT = String.valueOf(PORTNUM1);
-private static final String DYN_PORT = String.valueOf(PORTNUM2);
-private static final String ERROR_PORT = 
String.valueOf(AvailablePortFinder.getNextAvailable());
+private static final int PORT = PORTNUM1;
+private static final int DYN_PORT = PORTNUM2;
+private static final int ERROR_PORT = 
AvailablePortFinder.getNextAvailable();
 
 private static BlockingQueue list = new ArrayBlockingQueue<>(10);
 
@@ -104,8 +104,8 @@ public class SocketAppenderTest {
 @Test
 public void testTcpAppender() throws Exception {
 
-final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, Protocol.TCP, null, 0, "-1",
-"false", "Test", null, null, null, null, null, null);
+final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, Protocol.TCP, null, 0, -1,
+false, "Test", true, true, null, null, false, null);
 appender.start();
 
 // set appender on root and set level to debug
@@ -144,16 +144,16 @@ public class SocketAppenderTest {
 @Test
 public void testDefaultProtocol() throws Exception {
 
-final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, (Protocol) null,

logging-log4j2 git commit: Test clean ups.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master d49c49fd6 -> cb3d35e57


Test 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/cb3d35e5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cb3d35e5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cb3d35e5

Branch: refs/heads/master
Commit: cb3d35e572869b815766b9eb5986293fc5f3426f
Parents: d49c49f
Author: ggregory 
Authored: Wed Dec 2 09:21:49 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 09:21:49 2015 -0800

--
 .../log4j/core/appender/SocketAppenderTest.java| 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb3d35e5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 87b06cb..21bf250 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -54,11 +54,8 @@ import org.junit.Test;
  */
 public class SocketAppenderTest {
 
-private static final int PORTNUM1 = AvailablePortFinder.getNextAvailable();
-private static final int PORTNUM2 = AvailablePortFinder.getNextAvailable();
-
-private static final int PORT = PORTNUM1;
-private static final int DYN_PORT = PORTNUM2;
+private static final int PORT = AvailablePortFinder.getNextAvailable();
+private static final int DYN_PORT = AvailablePortFinder.getNextAvailable();
 private static final int ERROR_PORT = 
AvailablePortFinder.getNextAvailable();
 
 private static BlockingQueue list = new ArrayBlockingQueue<>(10);
@@ -74,7 +71,7 @@ public class SocketAppenderTest {
 
 @BeforeClass
 public static void setupClass() throws Exception {
-tcpServer = new TCPSocketServer(PORTNUM1);
+tcpServer = new 
TCPSocketServer(AvailablePortFinder.getNextAvailable());
 tcpServer.start();
 udpServer = new UDPSocketServer();
 udpServer.start();
@@ -178,7 +175,7 @@ public class SocketAppenderTest {
 root.setAdditive(false);
 root.setLevel(Level.DEBUG);
 
-new TCPSocketServer(PORTNUM2).start();
+new TCPSocketServer(AvailablePortFinder.getNextAvailable()).start();
 
 root.debug("This message is written because a deadlock never.");
 
@@ -212,7 +209,7 @@ public class SocketAppenderTest {
 private Thread thread;
 
 public UDPSocketServer() throws IOException {
-this.sock = new DatagramSocket(PORTNUM1);
+this.sock = new 
DatagramSocket(AvailablePortFinder.getNextAvailable());
 }
 
 public void shutdown() {

[2/5] logging-log4j2 git commit: Replace String protocol method with type-safe enum Protocol.

2015-12-02 Thread mikes 
Replace String protocol method with type-safe enum Protocol.

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

Branch: refs/heads/LOG4J2-649
Commit: 89000250a087f21238247adabc55602bb5815a8b
Parents: ec0bb19
Author: ggregory 
Authored: Tue Dec 1 18:25:01 2015 -0800
Committer: ggregory 
Committed: Tue Dec 1 18:25:01 2015 -0800

--
 .../apache/logging/log4j/core/appender/SocketAppender.java  | 7 +++
 .../logging/log4j/core/appender/SocketAppenderTest.java | 9 +
 .../log4j/core/net/server/AbstractSocketServerTest.java | 5 +++--
 .../log4j/core/net/server/SslXmlSocketServerTest.java   | 3 ++-
 .../log4j/core/net/server/TcpJsonSocketServerTest.java  | 3 ++-
 .../core/net/server/TcpSerializedSocketServerTest.java  | 3 ++-
 .../log4j/core/net/server/TcpXmlSocketServerTest.java   | 3 ++-
 .../log4j/core/net/server/UdpJsonSocketServerTest.java  | 3 ++-
 .../core/net/server/UdpSerializedSocketServerTest.java  | 3 ++-
 .../log4j/core/net/server/UdpXmlSocketServerTest.java   | 3 ++-
 10 files changed, 25 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/89000250/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 949eba8..60f3c17 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -79,7 +79,7 @@ public class SocketAppender extends 
AbstractOutputStreamAppenderhttp://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/89000250/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 472fb18..150ae70 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -42,6 +42,7 @@ import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
+import org.apache.logging.log4j.core.net.Protocol;
 import org.apache.logging.log4j.test.AvailablePortFinder;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -103,7 +104,7 @@ public class SocketAppenderTest {
 @Test
 public void testTcpAppender() throws Exception {
 
-final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, "tcp", null, 0, "-1",
+final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, Protocol.TCP, null, 0, "-1",
 "false", "Test", null, null, null, null, null, null);
 appender.start();
 
@@ -151,7 +152,7 @@ public class SocketAppenderTest {
 @Test
 public void testUdpAppender() throws Exception {
 
-final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, "udp", null, 0, "-1",
+final SocketAppender appender = 
SocketAppender.createAppender("localhost", PORT, Protocol.UDP, null, 0, "-1",
 "false", "Test", null, null, null, null, null, null);
 appender.start();
 
@@ -169,7 +170,7 @@ public class SocketAppenderTest {
 @Test
 public void testTcpAppenderDeadlock() throws Exception {
 
-final SocketAppender appender = 
SocketAppender.createAppender("localhost", DYN_PORT, "tcp", null, 0,
+final SocketAppender appender = 
SocketAppender.createAppender("localhost", DYN_PORT, Protocol.TCP, null, 0,
 "100", "false", "Test", null, null, null, null, null, null);
 appender.start();
 // set appender on root and set level to debug
@@ -188,7 +189,7 @@ public class SocketAppenderTest {
 @Test
 public void testTcpAppenderNoWait() throws Exception {
 
-final SocketAppender appender = 
SocketAppender.createAppender("localhost", ERROR_PORT, "tcp", null, 0,
+final SocketAppender appender = 
SocketAppender.createAppender("localhost",

[3/5] logging-log4j2 git commit: Javadoc.

2015-12-02 Thread mikes 
Javadoc.

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

Branch: refs/heads/LOG4J2-649
Commit: c50af9c7531afa038826916b189b4993d33bd2db
Parents: 8900025
Author: ggregory 
Authored: Tue Dec 1 21:33:12 2015 -0800
Committer: ggregory 
Committed: Tue Dec 1 21:33:12 2015 -0800

--
 .../java/org/apache/logging/log4j/core/appender/SocketAppender.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c50af9c7/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 60f3c17..87ba697 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -74,6 +74,7 @@ public class SocketAppender extends 
AbstractOutputStreamAppender

[1/5] logging-log4j2 git commit: Javadoc: Use the active voice.

2015-12-02 Thread mikes 
Repository: logging-log4j2
Updated Branches:
  refs/heads/LOG4J2-649 c672c93fa -> 673b1f9b0


Javadoc: Use the active voice.

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

Branch: refs/heads/LOG4J2-649
Commit: ec0bb193cffdae203f5c8b34b979ee51c5c71f10
Parents: 7f64fe8
Author: ggregory 
Authored: Tue Dec 1 18:18:03 2015 -0800
Committer: ggregory 
Committed: Tue Dec 1 18:18:03 2015 -0800

--
 .../main/java/org/apache/logging/log4j/core/net/Protocol.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ec0bb193/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Protocol.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Protocol.java 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Protocol.java
index e1b66ec..d45f4cd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Protocol.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/Protocol.java
@@ -17,7 +17,7 @@
 package org.apache.logging.log4j.core.net;
 
 /**
- * Enumeration of the supported protocols.
+ * Enumerates the supported protocols.
  */
 public enum Protocol {
 /** TCP Protocol. */
@@ -28,7 +28,7 @@ public enum Protocol {
 UDP;
 
 /**
- * Determine if the String matches this enum.
+ * Determines if the String matches this enum.
  * @param name The enumeration name to check.
  * @return true if this enumeration has the specified name.
  */

logging-log4j2 git commit: New SocketAppender factory API is now type safe.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master cb3d35e57 -> 85aed0c35


New SocketAppender factory API is now type safe.

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

Branch: refs/heads/master
Commit: 85aed0c35fbddd0fae64d9d1aabfceb6fe8eaa90
Parents: cb3d35e
Author: ggregory 
Authored: Wed Dec 2 16:29:05 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 16:29:05 2015 -0800

--
 .../logging/log4j/core/appender/SocketAppender.java  | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/85aed0c3/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index cda19e4..4212613 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -201,8 +201,15 @@ public class SocketAppender extends 
AbstractOutputStreamAppender

svn commit: r1717718 - /logging/log4net/tags/1.2.15RC1/

2015-12-02 Thread dpsenner 
Author: dpsenner
Date: Thu Dec  3 07:32:22 2015
New Revision: 1717718

URL: http://svn.apache.org/viewvc?rev=1717718=rev
Log:
Tagged 1.2.15 RC1

Added:
logging/log4net/tags/1.2.15RC1/   (props changed)
  - copied from r1716913, logging/log4net/trunk/

Propchange: logging/log4net/tags/1.2.15RC1/
--
bugtraq:logregex = (LOG4NET-\d+)

Propchange: logging/log4net/tags/1.2.15RC1/
--
bugtraq:url = http://issues.apache.org/jira/browse/%BUGID%

Propchange: logging/log4net/tags/1.2.15RC1/
--
--- svn:ignore (added)
+++ svn:ignore Thu Dec  3 07:32:22 2015
@@ -0,0 +1,7 @@
+bin
+build
+*.zip
+gc.log
+old-log4net.snk
+target
+

Propchange: logging/log4net/tags/1.2.15RC1/
--
svn:mergeinfo = /logging/log4net/branches/1.2.12:1511686-1520870

logging-log4j2 git commit: New SocketAppender factory API is now type safe. Clean ups.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 441b39331 -> 9101f80ae


New SocketAppender factory API is now type safe. 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/9101f80a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9101f80a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9101f80a

Branch: refs/heads/master
Commit: 9101f80ae8f35163bca86e3a91fe9a95ad9c68d5
Parents: 441b393
Author: ggregory 
Authored: Wed Dec 2 21:49:47 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 21:49:47 2015 -0800

--
 .../log4j/core/appender/SocketAppender.java | 30 ++--
 1 file changed, 15 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9101f80a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 4212613..9c21d4a 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -185,21 +185,21 @@ public class SocketAppender extends 
AbstractOutputStreamAppender layout,
-@PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise, 
-@PluginConfiguration final Configuration config) {
+final String host,
+final String portNum,
+final String protocolIn,
+final SslConfiguration sslConfig,
+final int connectTimeoutMillis,
+// deprecated
+final String delayMillis,
+final String immediateFail,
+final String name,
+final String immediateFlush,
+final String ignore,
+Layout layout,
+final Filter filter,
+final String advertise, 
+final Configuration config) {
 // @formatter:on
 boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
 final boolean isAdvertise = Boolean.parseBoolean(advertise);

logging-log4j2 git commit: Add ConsoleAppender.getTarget().

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 85aed0c35 -> 441b39331


Add ConsoleAppender.getTarget().

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

Branch: refs/heads/master
Commit: 441b393311bbbf832249099d6eaf907d9a6d1591
Parents: 85aed0c
Author: ggregory 
Authored: Wed Dec 2 21:27:48 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 21:27:48 2015 -0800

--
 .../logging/log4j/core/appender/ConsoleAppender.java | 15 +++
 .../log4j/core/appender/ConsoleAppenderTest.java |  4 +++-
 2 files changed, 14 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/441b3933/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 0466485..82a97d9 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -57,6 +57,8 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender layout, final Filter filter,
-final OutputStreamManager manager, final boolean ignoreExceptions) 
{
+final OutputStreamManager manager, final boolean ignoreExceptions, 
Target target) {
 super(name, layout, filter, ignoreExceptions, true, manager);
+this.target = target;
 }
 
 /**
@@ -101,13 +104,13 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender layout) {
 // this method cannot use the builder class without introducing an 
infinite loop due to DefaultConfiguration
 return new ConsoleAppender("DefaultConsole-" + 
COUNT.incrementAndGet(), layout, null,
-getDefaultManager(DEFAULT_TARGET, false, layout), true);
+getDefaultManager(DEFAULT_TARGET, false, layout), true, 
DEFAULT_TARGET);
 }
 
 @PluginBuilderFactory
@@ -173,7 +176,7 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppenderhttp://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/441b3933/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
index 16417b9..317fc17 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.core.appender;
 import static org.easymock.EasyMock.anyInt;
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.expectLastCall;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -37,10 +36,12 @@ import org.apache.logging.log4j.core.util.Constants;
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.easymock.EasyMockSupport;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+
 /**
  *
  */
@@ -133,6 +134,7 @@ public class ConsoleAppenderTest {
 private void testFollowSystemPrintStream(final PrintStream ps, final 
Target target, final SystemSetter systemSetter) {
 final ConsoleAppender app = 
ConsoleAppender.newBuilder().setTarget(target).setFollow(true)
 .setIgnoreExceptions(false).build();
+Assert.assertEquals(target, app.getTarget());
 app.start();
 try {
 final LogEvent event = Log4jLogEvent.newBuilder() //

logging-log4j2 git commit: New ConsoleAppender factory method is type safe, old method is deprecated.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 9101f80ae -> 4579f1439


New ConsoleAppender factory method is type safe, old method is
deprecated.

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

Branch: refs/heads/master
Commit: 4579f143958771e3f26d2b8dad944bb0e899bf54
Parents: 9101f80
Author: ggregory 
Authored: Wed Dec 2 22:22:22 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 22:22:22 2015 -0800

--
 .../log4j/core/appender/ConsoleAppender.java| 45 +---
 .../core/appender/ConsoleAppenderTest.java  | 10 ++---
 2 files changed, 43 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4579f143/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
--
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 82a97d9..10abd72 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -86,14 +86,15 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender layout,
-@PluginElement("Filter") final Filter filter,
-@PluginAttribute(value = "target", defaultString = "SYSTEM_OUT") 
final String targetStr,
-@PluginAttribute("name") final String name,
-@PluginAttribute(value = "follow", defaultBoolean = false) final 
String follow,
-@PluginAttribute(value = "ignoreExceptions", defaultBoolean = 
true) final String ignore) {
+@Deprecated
+public static ConsoleAppender createAppender(Layout layout,
+final Filter filter,
+final String targetStr,
+final String name,
+final String follow,
+final String ignore) {
 if (name == null) {
 LOGGER.error("No name provided for ConsoleAppender");
 return null;
@@ -107,6 +108,36 @@ public final class ConsoleAppender extends 
AbstractOutputStreamAppender layout,
+@PluginElement("Filter") final Filter filter,
+@PluginAttribute(value = "target") Target target,
+@PluginAttribute("name") final String name,
+@PluginAttribute(value = "follow", defaultBoolean = false) final 
boolean follow,
+@PluginAttribute(value = "ignoreExceptions", defaultBoolean = 
true) final boolean ignoreExceptions) {
+if (name == null) {
+LOGGER.error("No name provided for ConsoleAppender");
+return null;
+}
+if (layout == null) {
+layout = PatternLayout.createDefaultLayout();
+}
+target = target == null ? Target.SYSTEM_OUT : target;
+return new ConsoleAppender(name, layout, filter, getManager(target, 
follow, layout), ignoreExceptions, target);
+}
+
 public static ConsoleAppender createDefaultAppenderForLayout(final 
Layout layout) {
 // this method cannot use the builder class without introducing an 
infinite loop due to DefaultConfiguration
 return new ConsoleAppender("DefaultConsole-" + 
COUNT.incrementAndGet(), layout, null,

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4579f143/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
index 317fc17..65b3e2e 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
@@ -90,7 +90,7 @@ public class ConsoleAppenderTest {
 abstract void systemSet(PrintStream printStream);
 }
 
-private void testConsoleStreamManagerDoesNotClose(final PrintStream ps, 
final String targetName, final SystemSetter systemSetter) {
+private void testConsoleStreamManagerDoesNotClose(final PrintStream ps, 
final Target targetName, final SystemSetter systemSetter) {
 try {
 psMock.write((byte[]) anyObject(), anyInt(), anyInt());
 expectLastCall().anyTimes();
@@ -100,8 +100,8 @@ public class

logging-log4j2 git commit: Fix tests I broke earlier.

2015-12-02 Thread ggregory 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 4579f1439 -> b6c67b491


Fix tests I broke earlier.

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

Branch: refs/heads/master
Commit: b6c67b491bbac7a747e05db773ddd234673eab3f
Parents: 4579f14
Author: ggregory 
Authored: Wed Dec 2 22:47:55 2015 -0800
Committer: ggregory 
Committed: Wed Dec 2 22:47:55 2015 -0800

--
 .../apache/logging/log4j/core/appender/SocketAppenderTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6c67b49/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 21bf250..5e4a556 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -71,7 +71,7 @@ public class SocketAppenderTest {
 
 @BeforeClass
 public static void setupClass() throws Exception {
-tcpServer = new 
TCPSocketServer(AvailablePortFinder.getNextAvailable());
+tcpServer = new TCPSocketServer(PORT);
 tcpServer.start();
 udpServer = new UDPSocketServer();
 udpServer.start();
@@ -175,7 +175,7 @@ public class SocketAppenderTest {
 root.setAdditive(false);
 root.setLevel(Level.DEBUG);
 
-new TCPSocketServer(AvailablePortFinder.getNextAvailable()).start();
+new TCPSocketServer(DYN_PORT).start();
 
 root.debug("This message is written because a deadlock never.");
 
@@ -209,7 +209,7 @@ public class SocketAppenderTest {
 private Thread thread;
 
 public UDPSocketServer() throws IOException {
-this.sock = new 
DatagramSocket(AvailablePortFinder.getNextAvailable());
+this.sock = new DatagramSocket(PORT);
 }
 
 public void shutdown() {

logging-log4j2 git commit: Make sure that IdlePurgePolicy can handle an appender which hang on shutdown

2015-12-02 Thread mikes 
Repository: logging-log4j2
Updated Branches:
  refs/heads/master 1c786f6af -> 5a14032f2


Make sure that IdlePurgePolicy can handle an appender which hang on shutdown


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

Branch: refs/heads/master
Commit: 5a14032f27642b4e6dc78ad32778ef7c8e015c7b
Parents: 1c786f6
Author: Mikael Ståldal 
Authored: Wed Dec 2 10:42:21 2015 +0100
Committer: Mikael Ståldal 
Committed: Wed Dec 2 10:42:21 2015 +0100

--
 .../log4j/core/appender/HangingAppender.java| 29 ++--
 1 file changed, 27 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5a14032f/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
index a3ebbf0..3d456f2 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
@@ -33,10 +33,14 @@ public class HangingAppender extends AbstractAppender {
 private static final long serialVersionUID = 1L;
 
 private final long delay;
+private final long startupDelay;
+private final long shutdownDelay;
 
-public HangingAppender(final String name, final long delay) {
+public HangingAppender(final String name, final long delay, final long 
startupDelay, final long shutdownDelay) {
 super(name, null, null);
 this.delay = delay;
+this.startupDelay = startupDelay;
+this.shutdownDelay = shutdownDelay;
 }
 
 @Override
@@ -54,9 +58,30 @@ public class HangingAppender extends AbstractAppender {
 @Required(message = "No name provided for HangingAppender")
 final String name,
 @PluginAttribute("delay") final long delay,
+@PluginAttribute("startupDelay") final long startupDelay,
+@PluginAttribute("shutdownDelay") final long shutdownDelay,
 @PluginElement("Layout") final Layout 
layout,
 @PluginElement("Filter") final Filter filter) {
-return new HangingAppender(name, delay);
+return new HangingAppender(name, delay, startupDelay, shutdownDelay);
 }
 
+@Override
+public void start() {
+try {
+Thread.sleep(startupDelay);
+} catch (InterruptedException ignore) {
+// ignore
+}
+super.start();
+}
+
+@Override
+public void stop() {
+super.stop();
+try {
+Thread.sleep(shutdownDelay);
+} catch (InterruptedException ignore) {
+// ignore
+}
+}
 }

[2/2] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-649

2015-12-02 Thread mikes 
Merge branch 'master' into LOG4J2-649

Conflicts:

log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java


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

Branch: refs/heads/LOG4J2-649
Commit: 13bb3d9fa7ac975f59f912d27aae6077e5d9f646
Parents: 673b1f9 5a14032
Author: Mikael Ståldal 
Authored: Wed Dec 2 10:42:49 2015 +0100
Committer: Mikael Ståldal 
Committed: Wed Dec 2 10:42:49 2015 +0100

--
 .../log4j/core/appender/HangingAppender.java   | 17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)
--

[1/2] logging-log4j2 git commit: Make sure that IdlePurgePolicy can handle an appender which hang on shutdown

2015-12-02 Thread mikes 
Repository: logging-log4j2
Updated Branches:
  refs/heads/LOG4J2-649 673b1f9b0 -> 13bb3d9fa


Make sure that IdlePurgePolicy can handle an appender which hang on shutdown


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

Branch: refs/heads/LOG4J2-649
Commit: 5a14032f27642b4e6dc78ad32778ef7c8e015c7b
Parents: 1c786f6
Author: Mikael Ståldal 
Authored: Wed Dec 2 10:42:21 2015 +0100
Committer: Mikael Ståldal 
Committed: Wed Dec 2 10:42:21 2015 +0100

--
 .../log4j/core/appender/HangingAppender.java| 29 ++--
 1 file changed, 27 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5a14032f/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
--
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
index a3ebbf0..3d456f2 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
@@ -33,10 +33,14 @@ public class HangingAppender extends AbstractAppender {
 private static final long serialVersionUID = 1L;
 
 private final long delay;
+private final long startupDelay;
+private final long shutdownDelay;
 
-public HangingAppender(final String name, final long delay) {
+public HangingAppender(final String name, final long delay, final long 
startupDelay, final long shutdownDelay) {
 super(name, null, null);
 this.delay = delay;
+this.startupDelay = startupDelay;
+this.shutdownDelay = shutdownDelay;
 }
 
 @Override
@@ -54,9 +58,30 @@ public class HangingAppender extends AbstractAppender {
 @Required(message = "No name provided for HangingAppender")
 final String name,
 @PluginAttribute("delay") final long delay,
+@PluginAttribute("startupDelay") final long startupDelay,
+@PluginAttribute("shutdownDelay") final long shutdownDelay,
 @PluginElement("Layout") final Layout 
layout,
 @PluginElement("Filter") final Filter filter) {
-return new HangingAppender(name, delay);
+return new HangingAppender(name, delay, startupDelay, shutdownDelay);
 }
 
+@Override
+public void start() {
+try {
+Thread.sleep(startupDelay);
+} catch (InterruptedException ignore) {
+// ignore
+}
+super.start();
+}
+
+@Override
+public void stop() {
+super.stop();
+try {
+Thread.sleep(shutdownDelay);
+} catch (InterruptedException ignore) {
+// ignore
+}
+}
 }