You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/05/30 15:03:06 UTC
[01/12] logging-log4j2 git commit: "Ring Buffer" is two words,
so use camel case in ivar name.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1395 06c554689 -> a9bff15bb
"Ring Buffer" is two words, so use camel case in ivar 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/5e4e306c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5e4e306c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5e4e306c
Branch: refs/heads/LOG4J2-1395
Commit: 5e4e306cab220f32fe9ddb95b9eb2845c8567fdb
Parents: e012269
Author: ggregory <gg...@apache.org>
Authored: Thu May 26 10:08:03 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu May 26 10:08:03 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/logging/log4j/util/Unbox.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5e4e306c/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
index 8c1c8a7..abf9038 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
@@ -36,23 +36,23 @@ public class Unbox {
private static final int MASK = 16 - 1;
private static class State {
- private final StringBuilder[] ringbuffer = new StringBuilder[16];
+ private final StringBuilder[] ringBuffer = new StringBuilder[16];
private int current;
State() {
- for (int i = 0; i < ringbuffer.length; i++) {
- ringbuffer[i] = new StringBuilder(21);
+ for (int i = 0; i < ringBuffer.length; i++) {
+ ringBuffer[i] = new StringBuilder(21);
}
}
public StringBuilder getStringBuilder() {
- final StringBuilder result = ringbuffer[MASK & current++];
+ final StringBuilder result = ringBuffer[MASK & current++];
result.setLength(0);
return result;
}
public boolean isBoxedPrimitive(final StringBuilder text) {
- for (int i = 0; i < ringbuffer.length; i++) {
- if (text == ringbuffer[i]) {
+ for (int i = 0; i < ringBuffer.length; i++) {
+ if (text == ringBuffer[i]) {
return true;
}
}
[04/12] logging-log4j2 git commit: Remove unused and undocumented
method in Log4j-private class:
org.apache.logging.log4j.util.Unbox.isBoxedPrimitive(StringBuilder).
Posted by mi...@apache.org.
Remove unused and undocumented method in Log4j-private class:
org.apache.logging.log4j.util.Unbox.isBoxedPrimitive(StringBuilder).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/719727a1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/719727a1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/719727a1
Branch: refs/heads/LOG4J2-1395
Commit: 719727a130ae6e6f8002ac2a08e7a06c5208700f
Parents: 434528a
Author: ggregory <gg...@apache.org>
Authored: Thu May 26 23:17:17 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu May 26 23:17:17 2016 -0700
----------------------------------------------------------------------
log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/719727a1/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
index abf9038..41e403b 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
@@ -157,10 +157,6 @@ public class Unbox {
return getSB().append(value);
}
- public static boolean isBoxedPrimitive(final StringBuilder text) {
- return getState().isBoxedPrimitive(text);
- }
-
private static State getState() {
State state = threadLocalState.get();
if (state == null) {
[03/12] logging-log4j2 git commit: Update build instructions: the 1.2
API Clirr check MUST come AFTER install is run. This is not obvious when you
run from a SNAPSHOT build,
but it must be so for a version that you have never built before.
Posted by mi...@apache.org.
Update build instructions: the 1.2 API Clirr check MUST come AFTER
install is run. This is not obvious when you run from a SNAPSHOT build,
but it must be so for a version that you have never built before.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/434528a9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/434528a9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/434528a9
Branch: refs/heads/LOG4J2-1395
Commit: 434528a968c024e1086b98ad4cf3d4598d5f36f0
Parents: 219013b
Author: ggregory <gg...@apache.org>
Authored: Thu May 26 11:22:06 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu May 26 11:22:06 2016 -0700
----------------------------------------------------------------------
BUILDING.txt | 96 +++++++++++++++++++++++++++++--------------------------
1 file changed, 51 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/434528a9/BUILDING.txt
----------------------------------------------------------------------
diff --git a/BUILDING.txt b/BUILDING.txt
index 84dbc0e..33bfdcb 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -1,45 +1,51 @@
-Building Log4j 2
-
-To build Log4j 2, you need a JDK implementation version 1.7 or greater, and Apache Maven.
-Note that building the site requires Maven 3.0.5, while everything else works
-fine with any version of Maven 3.
-
-To perform the license release audit, a.k.a. "RAT check", run.
-
-mvn apache-rat:check
-
-To perform a Clirr check on the API modules, run
-
-mvn clirr:check -pl log4j-api
-mvn clirr:check -pl log4j-1.2-api
-
-To build the site with Java 7, make sure you give Maven enough memory using
-MAVEN_OPTS with options appropriate for your JVM. Alternatively, you can
-build with Java 8 and not deal with MAVEN_OPTS.
-
-To build the site, from a command line, run:
-
-mvn clean install
-mvn site
-
-On Windows, use a local staging directory, for example:
-
-mvn site:stage-deploy -DstagingSiteURL=file:///%HOME%/log4j
-
-On UNIX, use a local staging directory, for example:
-
-mvn site:stage-deploy -DstagingSiteURL=file:///$HOME/log4j
-
-To test, run:
-
-mvn test
-
-Then, to test OSGi, you must first create the jars:
-
-mvn install -DskipTests
-mvn package -DskipTests
-
-Next, you can run the tests as usual, which will pick up the jar files to use as OSGi bundles from the various target
-directories:
-
-mvn test
+Building Log4j 2
+
+To build Log4j 2, you need a JDK implementation version 1.7 or greater, and Apache Maven.
+Note that building the site requires Maven 3.0.5, while everything else works
+fine with any version of Maven 3.
+
+To perform the license release audit, a.k.a. "RAT check", run.
+
+mvn apache-rat:check
+
+To perform a Clirr check on the API module, run
+
+mvn clirr:check -pl log4j-api
+
+To build the site with Java 7, make sure you give Maven enough memory using
+MAVEN_OPTS with options appropriate for your JVM. Alternatively, you can
+build with Java 8 and not deal with MAVEN_OPTS.
+
+To build the site, from a command line, run:
+
+mvn clean install
+
+Once install is run, you can run the Clirr check on the 1.2 API module:
+
+mvn clirr:check -pl log4j-1.2-api
+
+Next, to build the site:
+
+mvn site
+
+On Windows, use a local staging directory, for example:
+
+mvn site:stage-deploy -DstagingSiteURL=file:///%HOME%/log4j
+
+On UNIX, use a local staging directory, for example:
+
+mvn site:stage-deploy -DstagingSiteURL=file:///$HOME/log4j
+
+To test, run:
+
+mvn test
+
+Then, to test OSGi, you must first create the jars:
+
+mvn install -DskipTests
+mvn package -DskipTests
+
+Next, you can run the tests as usual, which will pick up the jar files to use as OSGi bundles from the various target
+directories:
+
+mvn test
[02/12] logging-log4j2 git commit: Ignore Eclipse ".settings" folder.
Posted by mi...@apache.org.
Ignore Eclipse ".settings" folder.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/219013bc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/219013bc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/219013bc
Branch: refs/heads/LOG4J2-1395
Commit: 219013bc4541f1068da2593f0f93a1e22f4d9b23
Parents: 5e4e306
Author: ggregory <gg...@apache.org>
Authored: Thu May 26 10:09:39 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Thu May 26 10:09:39 2016 -0700
----------------------------------------------------------------------
log4j-bom/.gitignore | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/219013bc/log4j-bom/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-bom/.gitignore b/log4j-bom/.gitignore
index edc6e06..358cc65 100644
--- a/log4j-bom/.gitignore
+++ b/log4j-bom/.gitignore
@@ -1,2 +1,3 @@
/target/
/.project
+/.settings/
[05/12] logging-log4j2 git commit: Add a bunch of logo variations.
Posted by mi...@apache.org.
Add a bunch of logo variations.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5b8f503d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5b8f503d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5b8f503d
Branch: refs/heads/LOG4J2-1395
Commit: 5b8f503ddb27f445ed5df9c112e3cd3495367bb7
Parents: 719727a
Author: ggregory <gg...@apache.org>
Authored: Fri May 27 22:22:25 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri May 27 22:22:25 2016 -0700
----------------------------------------------------------------------
src/site/resources/logo/.logo-wood-1.png | Bin 0 -> 34322 bytes
src/site/resources/logo/.logo-wood-1.xcf | Bin 0 -> 64867 bytes
src/site/resources/logo/logo-3d-green-bg-2.png | Bin 0 -> 33619 bytes
src/site/resources/logo/logo-3d-green-bg-2.xcf | Bin 0 -> 58311 bytes
src/site/resources/logo/logo-3d-green-bg.png | Bin 0 -> 32865 bytes
src/site/resources/logo/logo-3d-green-bg.xcf | Bin 0 -> 58333 bytes
src/site/resources/logo/logo-big-blue.png | Bin 0 -> 30347 bytes
src/site/resources/logo/logo-big-blue.xcf | Bin 0 -> 55133 bytes
src/site/resources/logo/logo-blue-web-r2.6.png | Bin 0 -> 38268 bytes
src/site/resources/logo/logo-blue-web-r2.6.xcf | Bin 0 -> 64192 bytes
src/site/resources/logo/logo-blue-web.png | Bin 0 -> 35254 bytes
src/site/resources/logo/logo-blue-web.xcf | Bin 0 -> 63386 bytes
src/site/resources/logo/logo-chocolate-swirl-2.png | Bin 0 -> 31842 bytes
src/site/resources/logo/logo-chocolate-swirl-2.xcf | Bin 0 -> 58254 bytes
src/site/resources/logo/logo-chocolate-swirl.png | Bin 0 -> 34753 bytes
src/site/resources/logo/logo-chocolate-swirl.xcf | Bin 0 -> 64646 bytes
src/site/resources/logo/logo-craters-2.png | Bin 0 -> 30522 bytes
src/site/resources/logo/logo-craters-2.xcf | Bin 0 -> 58393 bytes
src/site/resources/logo/logo-craters.png | Bin 0 -> 32590 bytes
src/site/resources/logo/logo-craters.xcf | Bin 0 -> 58716 bytes
src/site/resources/logo/logo-electric-blue.png | Bin 0 -> 31853 bytes
src/site/resources/logo/logo-electric-blue.xcf | Bin 0 -> 58321 bytes
src/site/resources/logo/logo-granite-2.png | Bin 0 -> 33714 bytes
src/site/resources/logo/logo-granite-2.xcf | Bin 0 -> 58695 bytes
src/site/resources/logo/logo-granite.png | Bin 0 -> 31959 bytes
src/site/resources/logo/logo-granite.xcf | Bin 0 -> 58354 bytes
src/site/resources/logo/logo-ice.png | Bin 0 -> 33947 bytes
src/site/resources/logo/logo-ice.xcf | Bin 0 -> 64835 bytes
src/site/resources/logo/logo-java-1.png | Bin 0 -> 33698 bytes
src/site/resources/logo/logo-java-1.xcf | Bin 0 -> 58663 bytes
src/site/resources/logo/logo-java-2.png | Bin 0 -> 36999 bytes
src/site/resources/logo/logo-java-2.xcf | Bin 0 -> 64767 bytes
src/site/resources/logo/logo-java-3.png | Bin 0 -> 33016 bytes
src/site/resources/logo/logo-java-3.xcf | Bin 0 -> 58335 bytes
src/site/resources/logo/logo-leather-2.png | Bin 0 -> 33766 bytes
src/site/resources/logo/logo-leather-2.xcf | Bin 0 -> 58757 bytes
src/site/resources/logo/logo-leather.png | Bin 0 -> 32668 bytes
src/site/resources/logo/logo-leather.xcf | Bin 0 -> 58406 bytes
src/site/resources/logo/logo-lightning.png | Bin 0 -> 38593 bytes
src/site/resources/logo/logo-lightning.xcf | Bin 0 -> 64749 bytes
src/site/resources/logo/logo-marble-1.png | Bin 0 -> 33208 bytes
src/site/resources/logo/logo-marble-1.xcf | Bin 0 -> 64833 bytes
src/site/resources/logo/logo-paper-1.png | Bin 0 -> 33016 bytes
src/site/resources/logo/logo-paper-1.xcf | Bin 0 -> 58337 bytes
src/site/resources/logo/logo-paper-2.png | Bin 0 -> 33082 bytes
src/site/resources/logo/logo-paper-2.xcf | Bin 0 -> 58324 bytes
src/site/resources/logo/logo-parque-1.png | Bin 0 -> 33676 bytes
src/site/resources/logo/logo-parque-1.xcf | Bin 0 -> 58334 bytes
src/site/resources/logo/logo-parque-2.png | Bin 0 -> 32530 bytes
src/site/resources/logo/logo-parque-2.xcf | Bin 0 -> 58370 bytes
src/site/resources/logo/logo-parque-3.png | Bin 0 -> 32927 bytes
src/site/resources/logo/logo-parque-3.xcf | Bin 0 -> 58348 bytes
src/site/resources/logo/logo-pastel-stuff-2.png | Bin 0 -> 33441 bytes
src/site/resources/logo/logo-pastel-stuff-2.xcf | Bin 0 -> 58354 bytes
src/site/resources/logo/logo-pastel-stuff-3.png | Bin 0 -> 33194 bytes
src/site/resources/logo/logo-pastel-stuff-3.xcf | Bin 0 -> 58367 bytes
src/site/resources/logo/logo-pastel-stuff.png | Bin 0 -> 37102 bytes
src/site/resources/logo/logo-pastel-stuff.xcf | Bin 0 -> 64784 bytes
src/site/resources/logo/logo-pine.png | Bin 0 -> 28260 bytes
src/site/resources/logo/logo-pine.xcf | Bin 0 -> 61254 bytes
src/site/resources/logo/logo-pool-bottom-bg.png | Bin 0 -> 31480 bytes
src/site/resources/logo/logo-pool-bottom-bg.xcf | Bin 0 -> 58386 bytes
src/site/resources/logo/logo-pool-bottom.png | Bin 0 -> 33961 bytes
src/site/resources/logo/logo-pool-bottom.xcf | Bin 0 -> 64819 bytes
src/site/resources/logo/logo-qbert.png | Bin 0 -> 34606 bytes
src/site/resources/logo/logo-qbert.xcf | Bin 0 -> 64777 bytes
src/site/resources/logo/logo-rain.png | Bin 0 -> 34527 bytes
src/site/resources/logo/logo-rain.xcf | Bin 0 -> 64686 bytes
src/site/resources/logo/logo-red-cubes.png | Bin 0 -> 32485 bytes
src/site/resources/logo/logo-red-cubes.xcf | Bin 0 -> 58334 bytes
src/site/resources/logo/logo-rocks.png | Bin 0 -> 39238 bytes
src/site/resources/logo/logo-rocks.xcf | Bin 0 -> 64798 bytes
src/site/resources/logo/logo-sky.png | Bin 0 -> 33307 bytes
src/site/resources/logo/logo-sky.xcf | Bin 0 -> 64206 bytes
src/site/resources/logo/logo-starfield.png | Bin 0 -> 30603 bytes
src/site/resources/logo/logo-starfield.xcf | Bin 0 -> 56479 bytes
src/site/resources/logo/logo-stone.png | Bin 0 -> 39696 bytes
src/site/resources/logo/logo-stone.xcf | Bin 0 -> 64755 bytes
src/site/resources/logo/logo-tree-bark.png | Bin 0 -> 40313 bytes
src/site/resources/logo/logo-tree-bark.xcf | Bin 0 -> 64751 bytes
src/site/resources/logo/logo-walnut.png | Bin 0 -> 35644 bytes
src/site/resources/logo/logo-walnut.xcf | Bin 0 -> 64852 bytes
src/site/resources/logo/logo-wood-2.png | Bin 0 -> 33795 bytes
src/site/resources/logo/logo-wood-2.xcf | Bin 0 -> 64846 bytes
src/site/resources/logo/logo-wood.png | Bin 0 -> 37241 bytes
src/site/resources/logo/logo-wood.xcf | Bin 0 -> 64930 bytes
86 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/.logo-wood-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/.logo-wood-1.png b/src/site/resources/logo/.logo-wood-1.png
new file mode 100644
index 0000000..4d683e9
Binary files /dev/null and b/src/site/resources/logo/.logo-wood-1.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/.logo-wood-1.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/.logo-wood-1.xcf b/src/site/resources/logo/.logo-wood-1.xcf
new file mode 100644
index 0000000..57c29d2
Binary files /dev/null and b/src/site/resources/logo/.logo-wood-1.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-3d-green-bg-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-3d-green-bg-2.png b/src/site/resources/logo/logo-3d-green-bg-2.png
new file mode 100644
index 0000000..aa4da41
Binary files /dev/null and b/src/site/resources/logo/logo-3d-green-bg-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-3d-green-bg-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-3d-green-bg-2.xcf b/src/site/resources/logo/logo-3d-green-bg-2.xcf
new file mode 100644
index 0000000..627ed3e
Binary files /dev/null and b/src/site/resources/logo/logo-3d-green-bg-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-3d-green-bg.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-3d-green-bg.png b/src/site/resources/logo/logo-3d-green-bg.png
new file mode 100644
index 0000000..6244194
Binary files /dev/null and b/src/site/resources/logo/logo-3d-green-bg.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-3d-green-bg.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-3d-green-bg.xcf b/src/site/resources/logo/logo-3d-green-bg.xcf
new file mode 100644
index 0000000..9b28836
Binary files /dev/null and b/src/site/resources/logo/logo-3d-green-bg.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-big-blue.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-big-blue.png b/src/site/resources/logo/logo-big-blue.png
new file mode 100644
index 0000000..3a54e85
Binary files /dev/null and b/src/site/resources/logo/logo-big-blue.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-big-blue.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-big-blue.xcf b/src/site/resources/logo/logo-big-blue.xcf
new file mode 100644
index 0000000..81b26ea
Binary files /dev/null and b/src/site/resources/logo/logo-big-blue.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-blue-web-r2.6.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-blue-web-r2.6.png b/src/site/resources/logo/logo-blue-web-r2.6.png
new file mode 100644
index 0000000..f4235c9
Binary files /dev/null and b/src/site/resources/logo/logo-blue-web-r2.6.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-blue-web-r2.6.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-blue-web-r2.6.xcf b/src/site/resources/logo/logo-blue-web-r2.6.xcf
new file mode 100644
index 0000000..2a7f864
Binary files /dev/null and b/src/site/resources/logo/logo-blue-web-r2.6.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-blue-web.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-blue-web.png b/src/site/resources/logo/logo-blue-web.png
new file mode 100644
index 0000000..80afc5f
Binary files /dev/null and b/src/site/resources/logo/logo-blue-web.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-blue-web.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-blue-web.xcf b/src/site/resources/logo/logo-blue-web.xcf
new file mode 100644
index 0000000..25cf299
Binary files /dev/null and b/src/site/resources/logo/logo-blue-web.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-chocolate-swirl-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-chocolate-swirl-2.png b/src/site/resources/logo/logo-chocolate-swirl-2.png
new file mode 100644
index 0000000..24dafd4
Binary files /dev/null and b/src/site/resources/logo/logo-chocolate-swirl-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-chocolate-swirl-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-chocolate-swirl-2.xcf b/src/site/resources/logo/logo-chocolate-swirl-2.xcf
new file mode 100644
index 0000000..3a7558a
Binary files /dev/null and b/src/site/resources/logo/logo-chocolate-swirl-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-chocolate-swirl.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-chocolate-swirl.png b/src/site/resources/logo/logo-chocolate-swirl.png
new file mode 100644
index 0000000..48d464f
Binary files /dev/null and b/src/site/resources/logo/logo-chocolate-swirl.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-chocolate-swirl.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-chocolate-swirl.xcf b/src/site/resources/logo/logo-chocolate-swirl.xcf
new file mode 100644
index 0000000..f9b0025
Binary files /dev/null and b/src/site/resources/logo/logo-chocolate-swirl.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-craters-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-craters-2.png b/src/site/resources/logo/logo-craters-2.png
new file mode 100644
index 0000000..1fe3ffd
Binary files /dev/null and b/src/site/resources/logo/logo-craters-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-craters-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-craters-2.xcf b/src/site/resources/logo/logo-craters-2.xcf
new file mode 100644
index 0000000..77b0209
Binary files /dev/null and b/src/site/resources/logo/logo-craters-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-craters.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-craters.png b/src/site/resources/logo/logo-craters.png
new file mode 100644
index 0000000..96cf8a7
Binary files /dev/null and b/src/site/resources/logo/logo-craters.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-craters.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-craters.xcf b/src/site/resources/logo/logo-craters.xcf
new file mode 100644
index 0000000..83bed38
Binary files /dev/null and b/src/site/resources/logo/logo-craters.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-electric-blue.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-electric-blue.png b/src/site/resources/logo/logo-electric-blue.png
new file mode 100644
index 0000000..1ad7f67
Binary files /dev/null and b/src/site/resources/logo/logo-electric-blue.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-electric-blue.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-electric-blue.xcf b/src/site/resources/logo/logo-electric-blue.xcf
new file mode 100644
index 0000000..a05af65
Binary files /dev/null and b/src/site/resources/logo/logo-electric-blue.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-granite-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-granite-2.png b/src/site/resources/logo/logo-granite-2.png
new file mode 100644
index 0000000..e4f221e
Binary files /dev/null and b/src/site/resources/logo/logo-granite-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-granite-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-granite-2.xcf b/src/site/resources/logo/logo-granite-2.xcf
new file mode 100644
index 0000000..eccb8ef
Binary files /dev/null and b/src/site/resources/logo/logo-granite-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-granite.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-granite.png b/src/site/resources/logo/logo-granite.png
new file mode 100644
index 0000000..8044c2a
Binary files /dev/null and b/src/site/resources/logo/logo-granite.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-granite.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-granite.xcf b/src/site/resources/logo/logo-granite.xcf
new file mode 100644
index 0000000..deae9c5
Binary files /dev/null and b/src/site/resources/logo/logo-granite.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-ice.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-ice.png b/src/site/resources/logo/logo-ice.png
new file mode 100644
index 0000000..9ac0c42
Binary files /dev/null and b/src/site/resources/logo/logo-ice.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-ice.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-ice.xcf b/src/site/resources/logo/logo-ice.xcf
new file mode 100644
index 0000000..65797b3
Binary files /dev/null and b/src/site/resources/logo/logo-ice.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-java-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-java-1.png b/src/site/resources/logo/logo-java-1.png
new file mode 100644
index 0000000..1eb7c96
Binary files /dev/null and b/src/site/resources/logo/logo-java-1.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-java-1.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-java-1.xcf b/src/site/resources/logo/logo-java-1.xcf
new file mode 100644
index 0000000..62443de
Binary files /dev/null and b/src/site/resources/logo/logo-java-1.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-java-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-java-2.png b/src/site/resources/logo/logo-java-2.png
new file mode 100644
index 0000000..ba1b22a
Binary files /dev/null and b/src/site/resources/logo/logo-java-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-java-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-java-2.xcf b/src/site/resources/logo/logo-java-2.xcf
new file mode 100644
index 0000000..c732c55
Binary files /dev/null and b/src/site/resources/logo/logo-java-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-java-3.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-java-3.png b/src/site/resources/logo/logo-java-3.png
new file mode 100644
index 0000000..7233311
Binary files /dev/null and b/src/site/resources/logo/logo-java-3.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-java-3.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-java-3.xcf b/src/site/resources/logo/logo-java-3.xcf
new file mode 100644
index 0000000..2cf1948
Binary files /dev/null and b/src/site/resources/logo/logo-java-3.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-leather-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-leather-2.png b/src/site/resources/logo/logo-leather-2.png
new file mode 100644
index 0000000..59025d8
Binary files /dev/null and b/src/site/resources/logo/logo-leather-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-leather-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-leather-2.xcf b/src/site/resources/logo/logo-leather-2.xcf
new file mode 100644
index 0000000..7b0f357
Binary files /dev/null and b/src/site/resources/logo/logo-leather-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-leather.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-leather.png b/src/site/resources/logo/logo-leather.png
new file mode 100644
index 0000000..ae7c312
Binary files /dev/null and b/src/site/resources/logo/logo-leather.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-leather.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-leather.xcf b/src/site/resources/logo/logo-leather.xcf
new file mode 100644
index 0000000..503b641
Binary files /dev/null and b/src/site/resources/logo/logo-leather.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-lightning.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-lightning.png b/src/site/resources/logo/logo-lightning.png
new file mode 100644
index 0000000..e95649f
Binary files /dev/null and b/src/site/resources/logo/logo-lightning.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-lightning.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-lightning.xcf b/src/site/resources/logo/logo-lightning.xcf
new file mode 100644
index 0000000..dabed21
Binary files /dev/null and b/src/site/resources/logo/logo-lightning.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-marble-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-marble-1.png b/src/site/resources/logo/logo-marble-1.png
new file mode 100644
index 0000000..8981121
Binary files /dev/null and b/src/site/resources/logo/logo-marble-1.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-marble-1.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-marble-1.xcf b/src/site/resources/logo/logo-marble-1.xcf
new file mode 100644
index 0000000..b947cc3
Binary files /dev/null and b/src/site/resources/logo/logo-marble-1.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-paper-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-paper-1.png b/src/site/resources/logo/logo-paper-1.png
new file mode 100644
index 0000000..7616c3a
Binary files /dev/null and b/src/site/resources/logo/logo-paper-1.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-paper-1.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-paper-1.xcf b/src/site/resources/logo/logo-paper-1.xcf
new file mode 100644
index 0000000..2e0dd48
Binary files /dev/null and b/src/site/resources/logo/logo-paper-1.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-paper-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-paper-2.png b/src/site/resources/logo/logo-paper-2.png
new file mode 100644
index 0000000..0b1cada
Binary files /dev/null and b/src/site/resources/logo/logo-paper-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-paper-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-paper-2.xcf b/src/site/resources/logo/logo-paper-2.xcf
new file mode 100644
index 0000000..632a7f9
Binary files /dev/null and b/src/site/resources/logo/logo-paper-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-parque-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-parque-1.png b/src/site/resources/logo/logo-parque-1.png
new file mode 100644
index 0000000..f9bdfac
Binary files /dev/null and b/src/site/resources/logo/logo-parque-1.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-parque-1.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-parque-1.xcf b/src/site/resources/logo/logo-parque-1.xcf
new file mode 100644
index 0000000..4c1648f
Binary files /dev/null and b/src/site/resources/logo/logo-parque-1.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-parque-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-parque-2.png b/src/site/resources/logo/logo-parque-2.png
new file mode 100644
index 0000000..6996fbc
Binary files /dev/null and b/src/site/resources/logo/logo-parque-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-parque-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-parque-2.xcf b/src/site/resources/logo/logo-parque-2.xcf
new file mode 100644
index 0000000..3778e71
Binary files /dev/null and b/src/site/resources/logo/logo-parque-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-parque-3.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-parque-3.png b/src/site/resources/logo/logo-parque-3.png
new file mode 100644
index 0000000..d2763bd
Binary files /dev/null and b/src/site/resources/logo/logo-parque-3.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-parque-3.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-parque-3.xcf b/src/site/resources/logo/logo-parque-3.xcf
new file mode 100644
index 0000000..36f8b74
Binary files /dev/null and b/src/site/resources/logo/logo-parque-3.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pastel-stuff-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pastel-stuff-2.png b/src/site/resources/logo/logo-pastel-stuff-2.png
new file mode 100644
index 0000000..52b9403
Binary files /dev/null and b/src/site/resources/logo/logo-pastel-stuff-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pastel-stuff-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pastel-stuff-2.xcf b/src/site/resources/logo/logo-pastel-stuff-2.xcf
new file mode 100644
index 0000000..75c6d89
Binary files /dev/null and b/src/site/resources/logo/logo-pastel-stuff-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pastel-stuff-3.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pastel-stuff-3.png b/src/site/resources/logo/logo-pastel-stuff-3.png
new file mode 100644
index 0000000..e90fec3
Binary files /dev/null and b/src/site/resources/logo/logo-pastel-stuff-3.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pastel-stuff-3.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pastel-stuff-3.xcf b/src/site/resources/logo/logo-pastel-stuff-3.xcf
new file mode 100644
index 0000000..8e031af
Binary files /dev/null and b/src/site/resources/logo/logo-pastel-stuff-3.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pastel-stuff.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pastel-stuff.png b/src/site/resources/logo/logo-pastel-stuff.png
new file mode 100644
index 0000000..d3d5904
Binary files /dev/null and b/src/site/resources/logo/logo-pastel-stuff.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pastel-stuff.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pastel-stuff.xcf b/src/site/resources/logo/logo-pastel-stuff.xcf
new file mode 100644
index 0000000..e8631e8
Binary files /dev/null and b/src/site/resources/logo/logo-pastel-stuff.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pine.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pine.png b/src/site/resources/logo/logo-pine.png
new file mode 100644
index 0000000..60acf4c
Binary files /dev/null and b/src/site/resources/logo/logo-pine.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pine.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pine.xcf b/src/site/resources/logo/logo-pine.xcf
new file mode 100644
index 0000000..98819db
Binary files /dev/null and b/src/site/resources/logo/logo-pine.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pool-bottom-bg.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pool-bottom-bg.png b/src/site/resources/logo/logo-pool-bottom-bg.png
new file mode 100644
index 0000000..0321e20
Binary files /dev/null and b/src/site/resources/logo/logo-pool-bottom-bg.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pool-bottom-bg.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pool-bottom-bg.xcf b/src/site/resources/logo/logo-pool-bottom-bg.xcf
new file mode 100644
index 0000000..0af3d3d
Binary files /dev/null and b/src/site/resources/logo/logo-pool-bottom-bg.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pool-bottom.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pool-bottom.png b/src/site/resources/logo/logo-pool-bottom.png
new file mode 100644
index 0000000..1f1d4a6
Binary files /dev/null and b/src/site/resources/logo/logo-pool-bottom.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-pool-bottom.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-pool-bottom.xcf b/src/site/resources/logo/logo-pool-bottom.xcf
new file mode 100644
index 0000000..fdd1804
Binary files /dev/null and b/src/site/resources/logo/logo-pool-bottom.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-qbert.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-qbert.png b/src/site/resources/logo/logo-qbert.png
new file mode 100644
index 0000000..ee35821
Binary files /dev/null and b/src/site/resources/logo/logo-qbert.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-qbert.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-qbert.xcf b/src/site/resources/logo/logo-qbert.xcf
new file mode 100644
index 0000000..4c23e67
Binary files /dev/null and b/src/site/resources/logo/logo-qbert.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-rain.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-rain.png b/src/site/resources/logo/logo-rain.png
new file mode 100644
index 0000000..ae008b7
Binary files /dev/null and b/src/site/resources/logo/logo-rain.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-rain.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-rain.xcf b/src/site/resources/logo/logo-rain.xcf
new file mode 100644
index 0000000..2d3b823
Binary files /dev/null and b/src/site/resources/logo/logo-rain.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-red-cubes.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-red-cubes.png b/src/site/resources/logo/logo-red-cubes.png
new file mode 100644
index 0000000..7475126
Binary files /dev/null and b/src/site/resources/logo/logo-red-cubes.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-red-cubes.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-red-cubes.xcf b/src/site/resources/logo/logo-red-cubes.xcf
new file mode 100644
index 0000000..f610eb2
Binary files /dev/null and b/src/site/resources/logo/logo-red-cubes.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-rocks.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-rocks.png b/src/site/resources/logo/logo-rocks.png
new file mode 100644
index 0000000..9d8d76e
Binary files /dev/null and b/src/site/resources/logo/logo-rocks.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-rocks.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-rocks.xcf b/src/site/resources/logo/logo-rocks.xcf
new file mode 100644
index 0000000..ec35607
Binary files /dev/null and b/src/site/resources/logo/logo-rocks.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-sky.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-sky.png b/src/site/resources/logo/logo-sky.png
new file mode 100644
index 0000000..624732f
Binary files /dev/null and b/src/site/resources/logo/logo-sky.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-sky.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-sky.xcf b/src/site/resources/logo/logo-sky.xcf
new file mode 100644
index 0000000..e83cf3a
Binary files /dev/null and b/src/site/resources/logo/logo-sky.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-starfield.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-starfield.png b/src/site/resources/logo/logo-starfield.png
new file mode 100644
index 0000000..0d436ef
Binary files /dev/null and b/src/site/resources/logo/logo-starfield.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-starfield.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-starfield.xcf b/src/site/resources/logo/logo-starfield.xcf
new file mode 100644
index 0000000..c71fd1b
Binary files /dev/null and b/src/site/resources/logo/logo-starfield.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-stone.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-stone.png b/src/site/resources/logo/logo-stone.png
new file mode 100644
index 0000000..d2895af
Binary files /dev/null and b/src/site/resources/logo/logo-stone.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-stone.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-stone.xcf b/src/site/resources/logo/logo-stone.xcf
new file mode 100644
index 0000000..3ee3253
Binary files /dev/null and b/src/site/resources/logo/logo-stone.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-tree-bark.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-tree-bark.png b/src/site/resources/logo/logo-tree-bark.png
new file mode 100644
index 0000000..84d0e23
Binary files /dev/null and b/src/site/resources/logo/logo-tree-bark.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-tree-bark.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-tree-bark.xcf b/src/site/resources/logo/logo-tree-bark.xcf
new file mode 100644
index 0000000..d3c058c
Binary files /dev/null and b/src/site/resources/logo/logo-tree-bark.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-walnut.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-walnut.png b/src/site/resources/logo/logo-walnut.png
new file mode 100644
index 0000000..aa372a8
Binary files /dev/null and b/src/site/resources/logo/logo-walnut.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-walnut.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-walnut.xcf b/src/site/resources/logo/logo-walnut.xcf
new file mode 100644
index 0000000..944fb0e
Binary files /dev/null and b/src/site/resources/logo/logo-walnut.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-wood-2.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-wood-2.png b/src/site/resources/logo/logo-wood-2.png
new file mode 100644
index 0000000..28de65d
Binary files /dev/null and b/src/site/resources/logo/logo-wood-2.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-wood-2.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-wood-2.xcf b/src/site/resources/logo/logo-wood-2.xcf
new file mode 100644
index 0000000..f432e94
Binary files /dev/null and b/src/site/resources/logo/logo-wood-2.xcf differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-wood.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-wood.png b/src/site/resources/logo/logo-wood.png
new file mode 100644
index 0000000..e582763
Binary files /dev/null and b/src/site/resources/logo/logo-wood.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b8f503d/src/site/resources/logo/logo-wood.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-wood.xcf b/src/site/resources/logo/logo-wood.xcf
new file mode 100644
index 0000000..e6bab1c
Binary files /dev/null and b/src/site/resources/logo/logo-wood.xcf differ
[12/12] logging-log4j2 git commit: Docs
Posted by mi...@apache.org.
Docs
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a9bff15b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a9bff15b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a9bff15b
Branch: refs/heads/LOG4J2-1395
Commit: a9bff15bb237cc65bd2e58c6eba508cc60bc8d0f
Parents: 50d0bf1
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon May 30 17:02:49 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon May 30 17:02:49 2016 +0200
----------------------------------------------------------------------
src/site/xdoc/manual/appenders.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a9bff15b/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml
index ac562c5..065c87f 100644
--- a/src/site/xdoc/manual/appenders.xml
+++ b/src/site/xdoc/manual/appenders.xml
@@ -188,7 +188,13 @@
<td>boolean</td>
<td>Identifies whether the appender honors reassignments of System.out or System.err
via System.setOut or System.setErr made after configuration. Note that the follow
- attribute cannot be used with Jansi on Windows.</td>
+ attribute cannot be used with Jansi on Windows. Cannot be used with <code>direct</code>.</td>
+ </tr>
+ <tr>
+ <td>direct</td>
+ <td>boolean</td>
+ <td>Write directly to <code>java.io.FileDescriptor</code> and bypass <code>java.lang.System.out/.err</code>.
+ Can give up to 5x performance boost. Cannot be used with <code>follow</code>.</td>
</tr>
<tr>
<td>name</td>
[08/12] logging-log4j2 git commit: [LOG4J2-1399] Update Apache
Commons CSV from 1.3 to 1.4.
Posted by mi...@apache.org.
[LOG4J2-1399] Update Apache Commons CSV from 1.3 to 1.4.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1ff244f3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1ff244f3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1ff244f3
Branch: refs/heads/LOG4J2-1395
Commit: 1ff244f37dd072ec685bf18cd4dd9bd253afd50c
Parents: 848e233
Author: ggregory <gg...@apache.org>
Authored: Sun May 29 11:23:05 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun May 29 11:23:05 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1ff244f3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 13f01f6..552a330 100644
--- a/pom.xml
+++ b/pom.xml
@@ -736,7 +736,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-csv</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
</dependency>
<!-- GC-free -->
<dependency>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1ff244f3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4a1e2a0..4c5268c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -27,6 +27,9 @@
<action issue="LOG4J2-1398" dev="ggregory" type="update">
Update liquibase-core from 3.4.2 to 3.5.1.
</action>
+ <action issue="LOG4J2-1399" dev="ggregory" type="update">
+ Update Apache Commons CSV from 1.3 to 1.4.
+ </action>
</release>
<release version="2.6" date="2016-05-25" description="GA Release 2.6">
<action issue="LOG4J2-1270" dev="rpopma" type="add">
[09/12] logging-log4j2 git commit: [LOG4J2-1385] (GC) CSV layouts
should not create a new CSVPrinter for each log event.
Posted by mi...@apache.org.
[LOG4J2-1385] (GC) CSV layouts should not create a new CSVPrinter for
each log event.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4471c511
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4471c511
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4471c511
Branch: refs/heads/LOG4J2-1395
Commit: 4471c511f1280fe9cd2010ddf71e4614f80c5d97
Parents: 1ff244f
Author: ggregory <gg...@apache.org>
Authored: Sun May 29 11:46:13 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sun May 29 11:46:13 2016 -0700
----------------------------------------------------------------------
.../log4j/core/layout/CsvLogEventLayout.java | 35 ++++++++++----------
.../log4j/core/layout/CsvParameterLayout.java | 6 ++--
src/changes/changes.xml | 3 ++
3 files changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4471c511/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
index 12e0f3d..5077987 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvLogEventLayout.java
@@ -80,26 +80,27 @@ public class CsvLogEventLayout extends AbstractCsvLayout {
final StringBuilder buffer = getStringBuilder();
// Revisit when 1.3 is out so that we do not need to create a new
// printer for each event.
- try (final CSVPrinter printer = new CSVPrinter(buffer, getFormat())) {
- printer.print(event.getNanoTime());
- printer.print(event.getTimeMillis());
- printer.print(event.getLevel());
- printer.print(event.getThreadId());
- printer.print(event.getThreadName());
- printer.print(event.getThreadPriority());
- printer.print(event.getMessage().getFormattedMessage());
- printer.print(event.getLoggerFqcn());
- printer.print(event.getLoggerName());
- printer.print(event.getMarker());
- printer.print(event.getThrownProxy());
- printer.print(event.getSource());
- printer.print(event.getContextMap());
- printer.print(event.getContextStack());
- printer.println();
+ final CSVFormat format = getFormat();
+ try {
+ format.print(event.getNanoTime(), buffer, true);
+ format.print(event.getTimeMillis(), buffer, false);
+ format.print(event.getLevel(), buffer, false);
+ format.print(event.getThreadId(), buffer, false);
+ format.print(event.getThreadName(), buffer, false);
+ format.print(event.getThreadPriority(), buffer, false);
+ format.print(event.getMessage().getFormattedMessage(), buffer, false);
+ format.print(event.getLoggerFqcn(), buffer, false);
+ format.print(event.getLoggerName(), buffer, false);
+ format.print(event.getMarker(), buffer, false);
+ format.print(event.getThrownProxy(), buffer, false);
+ format.print(event.getSource(), buffer, false);
+ format.print(event.getContextMap(), buffer, false);
+ format.print(event.getContextStack(), buffer, false);
+ format.println(buffer);
return buffer.toString();
} catch (final IOException e) {
StatusLogger.getLogger().error(event.toString(), e);
- return getFormat().getCommentMarker() + " " + e;
+ return format.getCommentMarker() + " " + e;
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4471c511/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
index dcae328..3ddc172 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/CsvParameterLayout.java
@@ -89,10 +89,8 @@ public class CsvParameterLayout extends AbstractCsvLayout {
final Message message = event.getMessage();
final Object[] parameters = message.getParameters();
final StringBuilder buffer = getStringBuilder();
- // Revisit when 1.3 is out so that we do not need to create a new
- // printer for each event.
- try (final CSVPrinter printer = new CSVPrinter(buffer, getFormat())) {
- printer.printRecord(parameters);
+ try {
+ getFormat().printRecord(buffer, parameters);
return buffer.toString();
} catch (final IOException e) {
StatusLogger.getLogger().error(message, e);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4471c511/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4c5268c..1724b0d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.6.1" date="2016-MM-DD" description="GA Release 2.6.1">
+ <action issue="LOG4J2-1385" dev="ggregory" type="update">
+ (GC) CSV layouts should not create a new CSVPrinter for each log event.
+ </action>
<action issue="LOG4J2-1398" dev="ggregory" type="update">
Update liquibase-core from 3.4.2 to 3.5.1.
</action>
[06/12] logging-log4j2 git commit: Oops, rename 2 files.
Posted by mi...@apache.org.
Oops, rename 2 files.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/79708338
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/79708338
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/79708338
Branch: refs/heads/LOG4J2-1395
Commit: 79708338526a478704afb792cb98df70023b0d24
Parents: 5b8f503
Author: ggregory <gg...@apache.org>
Authored: Fri May 27 22:26:50 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri May 27 22:26:50 2016 -0700
----------------------------------------------------------------------
src/site/resources/logo/.logo-wood-1.png | Bin 34322 -> 0 bytes
src/site/resources/logo/.logo-wood-1.xcf | Bin 64867 -> 0 bytes
src/site/resources/logo/logo-wood-1.png | Bin 0 -> 34322 bytes
src/site/resources/logo/logo-wood-1.xcf | Bin 0 -> 64867 bytes
4 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79708338/src/site/resources/logo/.logo-wood-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/.logo-wood-1.png b/src/site/resources/logo/.logo-wood-1.png
deleted file mode 100644
index 4d683e9..0000000
Binary files a/src/site/resources/logo/.logo-wood-1.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79708338/src/site/resources/logo/.logo-wood-1.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/.logo-wood-1.xcf b/src/site/resources/logo/.logo-wood-1.xcf
deleted file mode 100644
index 57c29d2..0000000
Binary files a/src/site/resources/logo/.logo-wood-1.xcf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79708338/src/site/resources/logo/logo-wood-1.png
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-wood-1.png b/src/site/resources/logo/logo-wood-1.png
new file mode 100644
index 0000000..4d683e9
Binary files /dev/null and b/src/site/resources/logo/logo-wood-1.png differ
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79708338/src/site/resources/logo/logo-wood-1.xcf
----------------------------------------------------------------------
diff --git a/src/site/resources/logo/logo-wood-1.xcf b/src/site/resources/logo/logo-wood-1.xcf
new file mode 100644
index 0000000..57c29d2
Binary files /dev/null and b/src/site/resources/logo/logo-wood-1.xcf differ
[10/12] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1395
Posted by mi...@apache.org.
Merge branch 'master' into LOG4J2-1395
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c0366fd3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c0366fd3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c0366fd3
Branch: refs/heads/LOG4J2-1395
Commit: c0366fd3638d37584db9db2f8b8c3b4d9ff1f7de
Parents: 06c5546 4471c51
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon May 30 14:05:31 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon May 30 14:05:31 2016 +0200
----------------------------------------------------------------------
BUILDING.txt | 96 ++++++++++---------
.../org/apache/logging/log4j/util/Unbox.java | 16 ++--
log4j-bom/.gitignore | 1 +
.../log4j/core/layout/CsvLogEventLayout.java | 35 +++----
.../log4j/core/layout/CsvParameterLayout.java | 6 +-
pom.xml | 4 +-
src/changes/changes.xml | 11 +++
src/site/resources/logo/logo-3d-green-bg-2.png | Bin 0 -> 33619 bytes
src/site/resources/logo/logo-3d-green-bg-2.xcf | Bin 0 -> 58311 bytes
src/site/resources/logo/logo-3d-green-bg.png | Bin 0 -> 32865 bytes
src/site/resources/logo/logo-3d-green-bg.xcf | Bin 0 -> 58333 bytes
src/site/resources/logo/logo-big-blue.png | Bin 0 -> 30347 bytes
src/site/resources/logo/logo-big-blue.xcf | Bin 0 -> 55133 bytes
src/site/resources/logo/logo-blue-web-r2.6.png | Bin 0 -> 38268 bytes
src/site/resources/logo/logo-blue-web-r2.6.xcf | Bin 0 -> 64192 bytes
src/site/resources/logo/logo-blue-web.png | Bin 0 -> 35254 bytes
src/site/resources/logo/logo-blue-web.xcf | Bin 0 -> 63386 bytes
.../resources/logo/logo-chocolate-swirl-2.png | Bin 0 -> 31842 bytes
.../resources/logo/logo-chocolate-swirl-2.xcf | Bin 0 -> 58254 bytes
.../resources/logo/logo-chocolate-swirl.png | Bin 0 -> 34753 bytes
.../resources/logo/logo-chocolate-swirl.xcf | Bin 0 -> 64646 bytes
src/site/resources/logo/logo-craters-2.png | Bin 0 -> 30522 bytes
src/site/resources/logo/logo-craters-2.xcf | Bin 0 -> 58393 bytes
src/site/resources/logo/logo-craters.png | Bin 0 -> 32590 bytes
src/site/resources/logo/logo-craters.xcf | Bin 0 -> 58716 bytes
src/site/resources/logo/logo-electric-blue.png | Bin 0 -> 31853 bytes
src/site/resources/logo/logo-electric-blue.xcf | Bin 0 -> 58321 bytes
src/site/resources/logo/logo-granite-2.png | Bin 0 -> 33714 bytes
src/site/resources/logo/logo-granite-2.xcf | Bin 0 -> 58695 bytes
src/site/resources/logo/logo-granite.png | Bin 0 -> 31959 bytes
src/site/resources/logo/logo-granite.xcf | Bin 0 -> 58354 bytes
src/site/resources/logo/logo-ice.png | Bin 0 -> 33947 bytes
src/site/resources/logo/logo-ice.xcf | Bin 0 -> 64835 bytes
src/site/resources/logo/logo-java-1.png | Bin 0 -> 33698 bytes
src/site/resources/logo/logo-java-1.xcf | Bin 0 -> 58663 bytes
src/site/resources/logo/logo-java-2.png | Bin 0 -> 36999 bytes
src/site/resources/logo/logo-java-2.xcf | Bin 0 -> 64767 bytes
src/site/resources/logo/logo-java-3.png | Bin 0 -> 33016 bytes
src/site/resources/logo/logo-java-3.xcf | Bin 0 -> 58335 bytes
src/site/resources/logo/logo-leather-2.png | Bin 0 -> 33766 bytes
src/site/resources/logo/logo-leather-2.xcf | Bin 0 -> 58757 bytes
src/site/resources/logo/logo-leather.png | Bin 0 -> 32668 bytes
src/site/resources/logo/logo-leather.xcf | Bin 0 -> 58406 bytes
src/site/resources/logo/logo-lightning.png | Bin 0 -> 38593 bytes
src/site/resources/logo/logo-lightning.xcf | Bin 0 -> 64749 bytes
src/site/resources/logo/logo-marble-1.png | Bin 0 -> 33208 bytes
src/site/resources/logo/logo-marble-1.xcf | Bin 0 -> 64833 bytes
src/site/resources/logo/logo-paper-1.png | Bin 0 -> 33016 bytes
src/site/resources/logo/logo-paper-1.xcf | Bin 0 -> 58337 bytes
src/site/resources/logo/logo-paper-2.png | Bin 0 -> 33082 bytes
src/site/resources/logo/logo-paper-2.xcf | Bin 0 -> 58324 bytes
src/site/resources/logo/logo-parque-1.png | Bin 0 -> 33676 bytes
src/site/resources/logo/logo-parque-1.xcf | Bin 0 -> 58334 bytes
src/site/resources/logo/logo-parque-2.png | Bin 0 -> 32530 bytes
src/site/resources/logo/logo-parque-2.xcf | Bin 0 -> 58370 bytes
src/site/resources/logo/logo-parque-3.png | Bin 0 -> 32927 bytes
src/site/resources/logo/logo-parque-3.xcf | Bin 0 -> 58348 bytes
src/site/resources/logo/logo-pastel-stuff-2.png | Bin 0 -> 33441 bytes
src/site/resources/logo/logo-pastel-stuff-2.xcf | Bin 0 -> 58354 bytes
src/site/resources/logo/logo-pastel-stuff-3.png | Bin 0 -> 33194 bytes
src/site/resources/logo/logo-pastel-stuff-3.xcf | Bin 0 -> 58367 bytes
src/site/resources/logo/logo-pastel-stuff.png | Bin 0 -> 37102 bytes
src/site/resources/logo/logo-pastel-stuff.xcf | Bin 0 -> 64784 bytes
src/site/resources/logo/logo-pine.png | Bin 0 -> 28260 bytes
src/site/resources/logo/logo-pine.xcf | Bin 0 -> 61254 bytes
src/site/resources/logo/logo-pool-bottom-bg.png | Bin 0 -> 31480 bytes
src/site/resources/logo/logo-pool-bottom-bg.xcf | Bin 0 -> 58386 bytes
src/site/resources/logo/logo-pool-bottom.png | Bin 0 -> 33961 bytes
src/site/resources/logo/logo-pool-bottom.xcf | Bin 0 -> 64819 bytes
src/site/resources/logo/logo-qbert.png | Bin 0 -> 34606 bytes
src/site/resources/logo/logo-qbert.xcf | Bin 0 -> 64777 bytes
src/site/resources/logo/logo-rain.png | Bin 0 -> 34527 bytes
src/site/resources/logo/logo-rain.xcf | Bin 0 -> 64686 bytes
src/site/resources/logo/logo-red-cubes.png | Bin 0 -> 32485 bytes
src/site/resources/logo/logo-red-cubes.xcf | Bin 0 -> 58334 bytes
src/site/resources/logo/logo-rocks.png | Bin 0 -> 39238 bytes
src/site/resources/logo/logo-rocks.xcf | Bin 0 -> 64798 bytes
src/site/resources/logo/logo-sky.png | Bin 0 -> 33307 bytes
src/site/resources/logo/logo-sky.xcf | Bin 0 -> 64206 bytes
src/site/resources/logo/logo-starfield.png | Bin 0 -> 30603 bytes
src/site/resources/logo/logo-starfield.xcf | Bin 0 -> 56479 bytes
src/site/resources/logo/logo-stone.png | Bin 0 -> 39696 bytes
src/site/resources/logo/logo-stone.xcf | Bin 0 -> 64755 bytes
src/site/resources/logo/logo-tree-bark.png | Bin 0 -> 40313 bytes
src/site/resources/logo/logo-tree-bark.xcf | Bin 0 -> 64751 bytes
src/site/resources/logo/logo-walnut.png | Bin 0 -> 35644 bytes
src/site/resources/logo/logo-walnut.xcf | Bin 0 -> 64852 bytes
src/site/resources/logo/logo-wood-1.png | Bin 0 -> 34322 bytes
src/site/resources/logo/logo-wood-1.xcf | Bin 0 -> 64867 bytes
src/site/resources/logo/logo-wood-2.png | Bin 0 -> 33795 bytes
src/site/resources/logo/logo-wood-2.xcf | Bin 0 -> 64846 bytes
src/site/resources/logo/logo-wood.png | Bin 0 -> 37241 bytes
src/site/resources/logo/logo-wood.xcf | Bin 0 -> 64930 bytes
93 files changed, 91 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
[07/12] logging-log4j2 git commit: [LOG4J2-1398] Update
liquibase-core from 3.4.2 to 3.5.1.
Posted by mi...@apache.org.
[LOG4J2-1398] Update liquibase-core from 3.4.2 to 3.5.1.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/848e2331
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/848e2331
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/848e2331
Branch: refs/heads/LOG4J2-1395
Commit: 848e23318d955c2fdd3b81d6d5dd6fb6f9dd68d4
Parents: 7970833
Author: ggregory <gg...@apache.org>
Authored: Sat May 28 17:54:18 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sat May 28 17:54:18 2016 -0700
----------------------------------------------------------------------
pom.xml | 2 +-
src/changes/changes.xml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/848e2331/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8a6e984..13f01f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -706,7 +706,7 @@
<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
- <version>3.4.2</version>
+ <version>3.5.1</version>
</dependency>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/848e2331/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 39b659a..4a1e2a0 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,6 +23,11 @@
<title>Changes</title>
</properties>
<body>
+ <release version="2.6.1" date="2016-MM-DD" description="GA Release 2.6.1">
+ <action issue="LOG4J2-1398" dev="ggregory" type="update">
+ Update liquibase-core from 3.4.2 to 3.5.1.
+ </action>
+ </release>
<release version="2.6" date="2016-05-25" description="GA Release 2.6">
<action issue="LOG4J2-1270" dev="rpopma" type="add">
(GC) Added support for garbage-free logging in steady state.
[11/12] logging-log4j2 git commit: direct paramter to ConsoleAppender
Posted by mi...@apache.org.
direct paramter to ConsoleAppender
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/50d0bf16
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/50d0bf16
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/50d0bf16
Branch: refs/heads/LOG4J2-1395
Commit: 50d0bf16861503e41954c74be9db869308b3a3e2
Parents: c0366fd
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon May 30 16:34:19 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon May 30 16:34:19 2016 +0200
----------------------------------------------------------------------
.../log4j/core/appender/ConsoleAppender.java | 56 +++--
.../core/appender/FastConsoleAppender.java | 227 -------------------
.../core/appender/ConsoleAppenderTest.java | 14 +-
.../jmh/Log4j2AppenderComparisonBenchmark.java | 16 +-
.../resources/log4j2-appenderComparison.xml | 8 +-
5 files changed, 57 insertions(+), 264 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/50d0bf16/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 4e1e87c..64a3a5b 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
@@ -16,6 +16,8 @@
*/
package org.apache.logging.log4j.core.appender;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
@@ -80,12 +82,12 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
* @param layout The layout to use (required).
* @param filter The Filter or null.
* @param targetStr The target ("SYSTEM_OUT" or "SYSTEM_ERR"). The default is "SYSTEM_OUT".
- * @param follow If true will follow changes to the underlying output stream.
* @param name The name of the Appender (required).
+ * @param follow If true will follow changes to the underlying output stream.
* @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
* are propagated to the caller.
* @return The ConsoleAppender.
- * @deprecated Use {@link #createAppender(Layout, Filter, Target, String, boolean, boolean)}.
+ * @deprecated Use {@link #createAppender(Layout, Filter, Target, String, boolean, boolean, boolean)}.
*/
@Deprecated
public static ConsoleAppender createAppender(Layout<? extends Serializable> layout,
@@ -104,7 +106,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
final boolean isFollow = Boolean.parseBoolean(follow);
final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
final Target target = targetStr == null ? DEFAULT_TARGET : Target.valueOf(targetStr);
- return new ConsoleAppender(name, layout, filter, getManager(target, isFollow, layout), ignoreExceptions, target);
+ return new ConsoleAppender(name, layout, filter, getManager(target, isFollow, false, layout), ignoreExceptions, target);
}
/**
@@ -113,8 +115,10 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
* @param layout The layout to use (required).
* @param filter The Filter or null.
* @param target The target (SYSTEM_OUT or SYSTEM_ERR). The default is SYSTEM_OUT.
- * @param follow If true will follow changes to the underlying output stream.
* @param name The name of the Appender (required).
+ * @param follow If true will follow changes to the underlying output stream.
+ * @param direct If true will write directly to {@link java.io.FileDescriptor} and bypass
+ * {@link System#out}/{@link System#err}.
* @param ignoreExceptions If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
* are propagated to the caller.
* @return The ConsoleAppender.
@@ -127,6 +131,7 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
@PluginAttribute(value = "target") Target target,
@PluginAttribute("name") final String name,
@PluginAttribute(value = "follow", defaultBoolean = false) final boolean follow,
+ @PluginAttribute(value = "direct", defaultBoolean = false) final boolean direct,
@PluginAttribute(value = "ignoreExceptions", defaultBoolean = true) final boolean ignoreExceptions) {
// @formatter:on
if (name == null) {
@@ -137,13 +142,17 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
layout = PatternLayout.createDefaultLayout();
}
target = target == null ? Target.SYSTEM_OUT : target;
- return new ConsoleAppender(name, layout, filter, getManager(target, follow, layout), ignoreExceptions, target);
+ if (follow && direct) {
+ LOGGER.error("Cannot use both follow and direct on ConsoleAppender");
+ return null;
+ }
+ return new ConsoleAppender(name, layout, filter, getManager(target, follow, direct, layout), ignoreExceptions, target);
}
public static ConsoleAppender createDefaultAppenderForLayout(final Layout<? extends Serializable> 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, DEFAULT_TARGET);
+ getDefaultManager(DEFAULT_TARGET, false, false, layout), true, DEFAULT_TARGET);
}
@PluginBuilderFactory
@@ -175,6 +184,9 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
private boolean follow = false;
@PluginBuilderAttribute
+ private boolean direct = false;
+
+ @PluginBuilderAttribute
private boolean ignoreExceptions = true;
public Builder setLayout(final Layout<? extends Serializable> aLayout) {
@@ -202,6 +214,11 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
return this;
}
+ public Builder setDirect(final boolean shouldDirect) {
+ this.direct = shouldDirect;
+ return this;
+ }
+
public Builder setIgnoreExceptions(final boolean shouldIgnoreExceptions) {
this.ignoreExceptions = shouldIgnoreExceptions;
return this;
@@ -209,34 +226,39 @@ public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputSt
@Override
public ConsoleAppender build() {
- return new ConsoleAppender(name, layout, filter, getManager(target, follow, layout), ignoreExceptions, target);
+ if (follow && direct) {
+ throw new IllegalArgumentException("Cannot use both follow and direct on ConsoleAppender");
+ }
+ return new ConsoleAppender(name, layout, filter, getManager(target, follow, direct, layout), ignoreExceptions, target);
}
}
- private static OutputStreamManager getDefaultManager(final Target target, final boolean follow,
+ private static OutputStreamManager getDefaultManager(final Target target, final boolean follow, final boolean direct,
final Layout<? extends Serializable> layout) {
- final OutputStream os = getOutputStream(follow, target);
+ final OutputStream os = getOutputStream(follow, direct, target);
// LOG4J2-1176 DefaultConfiguration should not share OutputStreamManager instances to avoid memory leaks.
- final String managerName = target.name() + '.' + follow + "-" + COUNT.get();
+ final String managerName = target.name() + '.' + follow + '.' + direct + "-" + COUNT.get();
return OutputStreamManager.getManager(managerName, new FactoryData(os, managerName, layout), factory);
}
- private static OutputStreamManager getManager(final Target target, final boolean follow,
+ private static OutputStreamManager getManager(final Target target, final boolean follow, final boolean direct,
final Layout<? extends Serializable> layout) {
- final OutputStream os = getOutputStream(follow, target);
- final String managerName = target.name() + '.' + follow;
+ final OutputStream os = getOutputStream(follow, direct, target);
+ final String managerName = target.name() + '.' + follow + '.' + direct;
return OutputStreamManager.getManager(managerName, new FactoryData(os, managerName, layout), factory);
}
- private static OutputStream getOutputStream(final boolean follow, final Target target) {
+ private static OutputStream getOutputStream(final boolean follow, final boolean direct, final Target target) {
final String enc = Charset.defaultCharset().name();
- OutputStream outputStream = null;
+ OutputStream outputStream;
try {
// @formatter:off
outputStream = target == Target.SYSTEM_OUT ?
- follow ? new PrintStream(new SystemOutStream(), true, enc) : System.out :
- follow ? new PrintStream(new SystemErrStream(), true, enc) : System.err;
+ direct ? new FileOutputStream(FileDescriptor.out) :
+ (follow ? new PrintStream(new SystemOutStream(), true, enc) : System.out) :
+ direct ? new FileOutputStream(FileDescriptor.err) :
+ (follow ? new PrintStream(new SystemErrStream(), true, enc) : System.err);
// @formatter:on
outputStream = new CloseShieldOutputStream(outputStream);
} catch (final UnsupportedEncodingException ex) { // should never happen
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/50d0bf16/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FastConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FastConsoleAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FastConsoleAppender.java
deleted file mode 100644
index a7cd905..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FastConsoleAppender.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache license, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the license for the specific language governing permissions and
- * limitations under the license.
- */
-package org.apache.logging.log4j.core.appender;
-
-import java.io.FileDescriptor;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
-import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
-import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.apache.logging.log4j.core.util.CloseShieldOutputStream;
-
-/**
- * Appends log events to <code>System.out</code> or <code>System.err</code> using a layout specified by the user. The
- * default target is <code>System.out</code>.
- */
-@Plugin(name = "FastConsole", category = "Core", elementType = "appender", printObject = true)
-public final class FastConsoleAppender extends AbstractOutputStreamAppender<OutputStreamManager> {
-
- private static ConsoleManagerFactory factory = new ConsoleManagerFactory();
- private static final Target DEFAULT_TARGET = Target.SYSTEM_OUT;
- private static final AtomicInteger COUNT = new AtomicInteger();
-
- private final Target target;
-
- /**
- * Enumeration of console destinations.
- */
- public enum Target {
- /** Standard output. */
- SYSTEM_OUT,
- /** Standard error output. */
- SYSTEM_ERR
- }
-
- private FastConsoleAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
- final OutputStreamManager manager, final boolean ignoreExceptions, Target target) {
- super(name, layout, filter, ignoreExceptions, true, manager);
- this.target = target;
- }
-
- /**
- * Creates a Console Appender.
- *
- * @param layout The layout to use (required).
- * @param filter The Filter or null.
- * @param target The target (SYSTEM_OUT or SYSTEM_ERR). The default is SYSTEM_OUT.
- * @param name The name of the Appender (required).
- * @param ignoreExceptions If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise they
- * are propagated to the caller.
- * @return The ConsoleAppender.
- */
- @PluginFactory
- public static FastConsoleAppender createAppender(
- // @formatter:off
- @PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filter") final Filter filter,
- @PluginAttribute(value = "target") Target target,
- @PluginAttribute("name") final String name,
- @PluginAttribute(value = "ignoreExceptions", defaultBoolean = true) final boolean ignoreExceptions) {
- // @formatter:on
- 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 FastConsoleAppender(name, layout, filter, getManager(target, layout), ignoreExceptions, target);
- }
-
- public static FastConsoleAppender createDefaultAppenderForLayout(final Layout<? extends Serializable> layout) {
- // this method cannot use the builder class without introducing an infinite loop due to DefaultConfiguration
- return new FastConsoleAppender("DefaultConsole-" + COUNT.incrementAndGet(), layout, null,
- getDefaultManager(DEFAULT_TARGET, layout), true, DEFAULT_TARGET);
- }
-
- @PluginBuilderFactory
- public static Builder newBuilder() {
- return new Builder();
- }
-
- /**
- * Builds ConsoleAppender instances.
- */
- public static class Builder implements org.apache.logging.log4j.core.util.Builder<FastConsoleAppender> {
-
- @PluginElement("Layout")
- @Required
- private Layout<? extends Serializable> layout = PatternLayout.createDefaultLayout();
-
- @PluginElement("Filter")
- private Filter filter;
-
- @PluginBuilderAttribute
- @Required
- private Target target = DEFAULT_TARGET;
-
- @PluginBuilderAttribute
- @Required
- private String name;
-
- @PluginBuilderAttribute
- private boolean ignoreExceptions = true;
-
- public Builder setLayout(final Layout<? extends Serializable> aLayout) {
- this.layout = aLayout;
- return this;
- }
-
- public Builder setFilter(final Filter aFilter) {
- this.filter = aFilter;
- return this;
- }
-
- public Builder setTarget(final Target aTarget) {
- this.target = aTarget;
- return this;
- }
-
- public Builder setName(final String aName) {
- this.name = aName;
- return this;
- }
-
- public Builder setIgnoreExceptions(final boolean shouldIgnoreExceptions) {
- this.ignoreExceptions = shouldIgnoreExceptions;
- return this;
- }
-
- @Override
- public FastConsoleAppender build() {
- return new FastConsoleAppender(name, layout, filter, getManager(target, layout), ignoreExceptions, target);
- }
- }
-
- private static OutputStreamManager getDefaultManager(final Target target, final Layout<? extends Serializable> layout) {
- final OutputStream os = getOutputStream(target);
-
- // LOG4J2-1176 DefaultConfiguration should not share OutputStreamManager instances to avoid memory leaks.
- final String managerName = target.name() + '-' + COUNT.get();
- return OutputStreamManager.getManager(managerName, new FactoryData(os, managerName, layout), factory);
- }
-
- private static OutputStreamManager getManager(final Target target, final Layout<? extends Serializable> layout) {
- final OutputStream os = getOutputStream(target);
- final String managerName = target.name();
- return OutputStreamManager.getManager(managerName, new FactoryData(os, managerName, layout), factory);
- }
-
- private static OutputStream getOutputStream(final Target target) {
- OutputStream outputStream = target == Target.SYSTEM_OUT
- ? new FileOutputStream(FileDescriptor.out)
- : new FileOutputStream(FileDescriptor.err);
- return new CloseShieldOutputStream(outputStream);
- }
-
- /**
- * Data to pass to factory method.
- */
- private static class FactoryData {
- private final OutputStream os;
- private final String name;
- private final Layout<? extends Serializable> layout;
-
- /**
- * Constructor.
- *
- * @param os The OutputStream.
- * @param type The name of the target.
- * @param layout A Serializable layout
- */
- public FactoryData(final OutputStream os, final String type, final Layout<? extends Serializable> layout) {
- this.os = os;
- this.name = type;
- this.layout = layout;
- }
- }
-
- /**
- * Factory to create the Appender.
- */
- private static class ConsoleManagerFactory implements ManagerFactory<OutputStreamManager, FactoryData> {
-
- /**
- * Create an OutputStreamManager.
- *
- * @param name The name of the entity to manage.
- * @param data The data required to create the entity.
- * @return The OutputStreamManager
- */
- @Override
- public OutputStreamManager createManager(final String name, final FactoryData data) {
- return new OutputStreamManager(data.os, data.name, data.layout, true);
- }
- }
-
- public Target getTarget() {
- return target;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/50d0bf16/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 65b3e2e..78ca50e 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
@@ -16,13 +16,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;
-
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
@@ -41,6 +34,11 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import static org.easymock.EasyMock.anyInt;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.junit.Assert.*;
+
/**
*
@@ -100,7 +98,7 @@ public class ConsoleAppenderTest {
mocks.replayAll();
systemSetter.systemSet(psMock);
final Layout<String> layout = PatternLayout.createLayout(null, null, null, null, null, false, false, null, null);
- final ConsoleAppender app = ConsoleAppender.createAppender(layout, null, targetName, "Console", false,
+ final ConsoleAppender app = ConsoleAppender.createAppender(layout, null, targetName, "Console", false, false,
false);
app.start();
assertTrue("Appender did not start", app.isStarted());
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/50d0bf16/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
index a4ea02e..6d5e8b2 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
@@ -57,14 +57,14 @@ public class Log4j2AppenderComparisonBenchmark {
private Logger rafLogger;
private Logger mmapLogger;
private Logger consoleLogger;
- private Logger fastConsoleLogger;
+ private Logger directConsoleLogger;
private Logger noopLogger;
private Logger rewriteLogger;
private Appender fileAppender;
private Appender rafAppender;
private Appender mmapAppender;
private Appender consoleAppender;
- private Appender fastConsoleAppender;
+ private Appender directConsoleAppender;
private Appender noopAppender;
private Appender rewriteAppender;
@@ -104,7 +104,7 @@ public class Log4j2AppenderComparisonBenchmark {
rafLogger = LogManager.getLogger("RAFLogger");
mmapLogger = LogManager.getLogger("MMapLogger");
consoleLogger = LogManager.getLogger("ConsoleLogger");
- fastConsoleLogger = LogManager.getLogger("FastConsoleLogger");
+ directConsoleLogger = LogManager.getLogger("DirectConsoleLogger");
noopLogger = LogManager.getLogger("NoopLogger");
rewriteLogger = LogManager.getLogger("RewriteLogger");
@@ -112,7 +112,7 @@ public class Log4j2AppenderComparisonBenchmark {
rafAppender = ((org.apache.logging.log4j.core.Logger) rafLogger).getAppenders().get("RandomAccessFile");
mmapAppender = ((org.apache.logging.log4j.core.Logger) mmapLogger).getAppenders().get("MemoryMappedFile");
consoleAppender = ((org.apache.logging.log4j.core.Logger) consoleLogger).getAppenders().get("Console");
- fastConsoleAppender = ((org.apache.logging.log4j.core.Logger) fastConsoleLogger).getAppenders().get("FastConsole");
+ directConsoleAppender = ((org.apache.logging.log4j.core.Logger) directConsoleLogger).getAppenders().get("DirectConsole");
noopAppender = ((org.apache.logging.log4j.core.Logger) noopLogger).getAppenders().get("NoOp");
rewriteAppender = ((org.apache.logging.log4j.core.Logger) rewriteLogger).getAppenders().get("Rewrite");
}
@@ -226,14 +226,14 @@ public class Log4j2AppenderComparisonBenchmark {
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.SECONDS)
@Benchmark
- public void end2endFastConsole() {
- fastConsoleLogger.debug(MESSAGE);
+ public void end2endDirectConsole() {
+ directConsoleLogger.debug(MESSAGE);
}
@BenchmarkMode(Mode.Throughput)
@OutputTimeUnit(TimeUnit.SECONDS)
@Benchmark
- public void appenderFastConsole() {
- fastConsoleAppender.append(EVENT);
+ public void appenderDirectConsole() {
+ directConsoleAppender.append(EVENT);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/50d0bf16/log4j-perf/src/main/resources/log4j2-appenderComparison.xml
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/resources/log4j2-appenderComparison.xml b/log4j-perf/src/main/resources/log4j2-appenderComparison.xml
index 8ad6327..70ce369 100644
--- a/log4j-perf/src/main/resources/log4j2-appenderComparison.xml
+++ b/log4j-perf/src/main/resources/log4j2-appenderComparison.xml
@@ -21,9 +21,9 @@
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d %p [%t] %c{1} %X{transactionId} - %m%n"/>
</Console>
- <FastConsole name="FastConsole" target="SYSTEM_OUT">
+ <Console name="DirectConsole" target="SYSTEM_OUT" direct="true">
<PatternLayout pattern="%d %p [%t] %c{1} %X{transactionId} - %m%n"/>
- </FastConsole>
+ </Console>
<File name="File" fileName="target/testlog4j2.log" immediateFlush="false">
<PatternLayout pattern="%d %p [%t] %c{1} %X{transactionId} - %m%n"/>
</File>
@@ -58,8 +58,8 @@
<Logger name="ConsoleLogger" level="debug" additivity="false">
<AppenderRef ref="Console"/>
</Logger>
- <Logger name="FastConsoleLogger" level="debug" additivity="false">
- <AppenderRef ref="FastConsole"/>
+ <Logger name="DirectConsoleLogger" level="debug" additivity="false">
+ <AppenderRef ref="DirectConsole"/>
</Logger>
<Logger name="NoopLogger" level="debug" additivity="false">
<AppenderRef ref="NoOp"/>