[11/14] logging-log4j2 git commit: New SocketAppender factory API is now type safe. Clean ups.

2015-12-03 Thread mikes 
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/LOG4J2-649
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);

[07/14] logging-log4j2 git commit: New SocketAppender factory API is now type safe.

2015-12-03 Thread mikes 
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/LOG4J2-649
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, null, 0, "-1",
-"false", "Test", null, null, null, null, null, null);
+

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: 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

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);