(logging-log4j-samples) branch dependabot/maven/org.junit-junit-bom-5.10.1 created (now 323d269)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.junit-junit-bom-5.10.1 in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git at 323d269 Bump org.junit:junit-bom from 5.9.0 to 5.10.1 No new revisions were added by this update.
(logging-log4j-samples) branch dependabot/maven/spring-boot.version-3.1.5 created (now 8fefaf6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/spring-boot.version-3.1.5 in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git at 8fefaf6 Bump spring-boot.version from 2.7.17 to 3.1.5 No new revisions were added by this update.
(logging-site) branch activity-monitor updated: added vscode to gitignore
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch activity-monitor in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/activity-monitor by this push: new 3cc0726f added vscode to gitignore 3cc0726f is described below commit 3cc0726feabe8d8f8460cfb3dd0aacd73ec33130 Author: Christian Grobmeier AuthorDate: Tue Nov 14 23:19:47 2023 +0100 added vscode to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7b7183b9..d0cc0dfe 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ .project .settings .DS_Store +.vscode \ No newline at end of file
(logging-parent) branch asf-site updated: Add `logging-parent` version `10.4.0` website
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 2b474fa Add `logging-parent` version `10.4.0` website
2b474fa is described below
commit 2b474facf81b7afaecba3747893338c77364f9f7
Author: Volkan Yazıcı
AuthorDate: Tue Nov 14 22:36:15 2023 +0100
Add `logging-parent` version `10.4.0` website
---
10.x/index.html | 62 +
1 file changed, 49 insertions(+), 13 deletions(-)
diff --git a/10.x/index.html b/10.x/index.html
index d7bbea7..72fe0e7 100644
--- a/10.x/index.html
+++ b/10.x/index.html
@@ -545,6 +545,7 @@ table.CodeRay td.code{padding:0 0 0 .75em}
Security
Release Notes
+10.4.0
10.3.0
10.2.0
10.1.1
@@ -695,7 +696,7 @@ This VDR is accessible through the following URL: https://logging.apach
-Add org.apache.logging:logging-parent:10.3.0 as a
parent to your pom.xml
+Add org.apache.logging:logging-parent:10.4.0 as a
parent to your pom.xml
@@ -792,6 +793,40 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
Release Notes
+10.4.0
+
+
+Release date
+
+2023-11-13
+
+
+
+
+This minor release contains several small improvements.
+
+
+Added
+
+
+
+Add deterministic Palantir Java formatter
+
+
+
+
+
+Changed
+
+
+
+Increase directory scanning depth from 8 to 32 in the distribution
BeanShell script
+
+
+
+
+
+
10.3.0
@@ -805,7 +840,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
This minor release contains several small improvements.
-Added
+Added
@@ -824,7 +859,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
-Changed
+Changed
@@ -885,7 +920,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
This minor release contains several small improvements.
-Added
+Added
@@ -895,7 +930,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
-Changed
+Changed
@@ -956,7 +991,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
This patch release contains minor fixes addressing issues blocking the
release of log4j-tools, log4j-kotlin, etc.
-Added
+Added
@@ -966,7 +1001,7 @@ See https://logging.apache.org/log4j/2.x/security.html;>the Log4j Secur
-Changed
+Changed
@@ -1013,7 +1048,7 @@ Hence, no need for custom .bnd and/or
module-info.java
In particular, we expect the absence of module-info.java files to
avoid several IDE and testing related headaches.
-Added
+Added
@@ -1035,7 +1070,7 @@ In particular, we expect the absence of
module-info.java files to a
-Changed
+Changed
@@ -1100,7 +1135,7 @@ See README.adoc for the complete list of
features and their usage.<
All preparations (release notes, source and binary distributions, vote
announcement emails, etc.) are staged to both Nexus and SVN and waiting the
release manager to proceed.
-Added
+Added
@@ -1131,7 +1166,7 @@ All preparations (release notes, source and binary
distributions, vote ann
-Changed
+Changed
@@ -1435,10 +1470,11 @@ svn co
https://dist.apache.org/repos/dist/release/logging logging-dist-rel
cd logging-dist-rel
mkdir -p logging-parent/7.8.0
cp ../logging-dist-dev/logging-parent/*-7.8.0-{bin,src}.* logging-parent/7.8.0/
+svn add logging-parent/7.8.0
svn commit -m 'Add `logging-parent` version `7.8.0` distribution'
# Update `dev` folder
-cd logging-dist-dev
+cd ../logging-dist-dev
cp logging-parent/*-7.8.0-email-announce.txt /tmp
svn rm logging-parent
svn commit -m 'Remove `logging-parent` version `7.8.0` files
released'
@@ -1552,7 +1588,7 @@ See the License for the specific language governing
permissions and limitations
-Last updated 2023-11-09 09:08:55 UTC
+Last updated 2023-11-13 20:52:45 UTC
svn commit: r65288 - /dev/logging/logging-parent/
Author: vy Date: Tue Nov 14 21:32:35 2023 New Revision: 65288 Log: Remove `logging-parent` version `10.4.0` files released Removed: dev/logging/logging-parent/
svn commit: r65287 - in /release/logging/logging-parent: 10.3.0/ 10.4.0/
Author: vy Date: Tue Nov 14 21:31:53 2023 New Revision: 65287 Log: Add `logging-parent` version `10.4.0` distribution Added: release/logging/logging-parent/10.4.0/ release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip (with props) release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.asc release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.sha512 release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip (with props) release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.asc release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.sha512 Removed: release/logging/logging-parent/10.3.0/ Added: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip == Binary file - no diff available. Propchange: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip -- svn:mime-type = application/octet-stream Added: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.asc == --- release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.asc (added) +++ release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.asc Tue Nov 14 21:31:53 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmVSjM0ACgkQVuc7qaC1 +ktDR/w//XrYbp+PEbH8N6cluFctamRfA95kebsHCD3El2Q5vcf0tGO1+k1Ob1Zgb +7V/xX0YrKDCDF7ZyYGF9avuC7/fCYwUA5GdVZyoWZUhTQc+xrltGDx5RzZ7Tnht/ +YtIkWKzSU1WcHxxcRRQflVWWvDjXJnJ2sWdZRy9AOziFMviljBpTTCixajONugfh +4Zkw5G0cMuGy83NUoGv0wcSWOKl9odHtP+gOuso4KSa1PW+YZyIPjZWkL+FJZ9R9 +JomMIzkgsO8gSTUnITGkR2qgKoshrcWbggxmpXCh2Q/xvqNx6ITTZ+5f2fvNQcw7 +J/3OOdLX7LR1c8P2P5i1qfviRIsQL+iTTqAfiKJi64tiG/UqY/R+OTwtd5qfR+d5 +fAKrtVjYYvnnG1bhxExdMFoK9nwvChWeV/VIOGX3NhGPcv/8jO1nr+ytrMZ624As +lvb0Q8+9SyZD6TU+yM4AZMBS2pm84XHcDT+FLaSxx1yFJ1a8Os8+7P/18lxiAiZY +K6lpudcbtEMGUZy+zgNlF55UR2lEiR7KLMOtxHV6iGGQkhvS/MzRFnLSYXBykTuK +2DgKYd8WUN75VqAHpuaRl26qKaxqIdUp4nSKvvTKYHRUCZWRe3XKtuWb6uVKUt3F +ukW+qh0H+B78l4fYsYzOMPGIx/zTEM7WiHuYRQGzOnVvoJaHYRw= +=zrqc +-END PGP SIGNATURE- Added: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.sha512 == --- release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.sha512 (added) +++ release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-bin.zip.sha512 Tue Nov 14 21:31:53 2023 @@ -0,0 +1 @@ +7207a76ba81bc5f1dfe6a486afcac95cf20848ee5b9a0886415159b14fe751bb38212696cfbc7b7837e7aa3033923468a8b7250e38de88e5d10b802a0220d2c8 apache-logging-parent-10.4.0-bin.zip Added: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip == Binary file - no diff available. Propchange: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip -- svn:mime-type = application/octet-stream Added: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.asc == --- release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.asc (added) +++ release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.asc Tue Nov 14 21:31:53 2023 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEB36Ik6bcwz3UpNWyVuc7qaC1ktAFAmVSjM0ACgkQVuc7qaC1 +ktBd9w//dd1/PfQxGsLyf4mJwRCDtn5FDahtHuI8/+0LPhGaPuhM1SYTelpG+jrE +B85vfzddoN4Bv1yEM4I3+a7Fk6cIfrm8g7Z96ndswTyqgMg7vapFcXpdkRiI0fvD +woH2ZxW9Oc361g2mizNGrMqRJ8Nuh56i4F1XpUkSqSx1N2RmoKiI9gbsDKTRV2U9 +dBy1vY1GJBFgE473O1cku+RjRPhCn8erJQ0M7R0HvC0hnEvCPriiXmPwVlGuhNqo +FJ5CZc/DtHOxrLHRlMrjLUTxyF4CanpMlg3sIJv+26ExeiHBJ38pz9Nw/SVKr7px +zFhS7hdn6SNuPV/mqf4X/t/qLUBFnxvRGM3hrhj5DZwXa4V6SXCFH9dQMOpCkhWh +cfdX3YOeHZbAs8vKslPwZS/2O2H6CJj02Cz91oh4loENtArcxzV69r5IHxrRngIi +W9eZ3uDmIvicDPTN6nFSRcXelwpM4F5s1QwWQSDBK4/fun/vhTpXMJnqZizjs0mD +xgtRTgmvGnncXp8mCfKss5CQ7cfDNqB2p4+2bWNuQM9xoIwZtc1bQAHF/JudrsnU +ggMvjdwy8bZHl73Jva7VfZRRwtyrWkSouDudxb6ZRul+oA4CNdpIvF8aW+EAPZ85 +87ZSM1q72U8lIO4THoJkUEk8orEimJTTPeDjSMu5cI5GbwzDk3U= +=Clef +-END PGP SIGNATURE- Added: release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.sha512 == --- release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.sha512 (added) +++ release/logging/logging-parent/10.4.0/apache-logging-parent-10.4.0-src.zip.sha512 Tue Nov 14 21:31:53 2023 @@ -0,0 +1 @@
(logging-parent) 01/01: Set the version to `10.5.0-SNAPSHOT`
This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-parent.git commit 97b2aad056827defda2ead8d5650c1e9f403bba0 Author: Volkan Yazıcı AuthorDate: Tue Nov 14 22:23:34 2023 +0100 Set the version to `10.5.0-SNAPSHOT` --- pom.xml | 2 +- src/site/_constants.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c6a6821..74e7947 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ -10.4.0 +10.5.0-SNAPSHOT
(logging-parent) branch release/10.4.0 deleted (was e45457c)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch release/10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git was e45457c Update the `project.build.outputTimestamp` property The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-parent) branch main updated (9c5c595 -> 97b2aad)
This is an automated email from the ASF dual-hosted git repository.
vy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-parent.git
from 9c5c595 Remove incorrect changelog entry
add da3fdfb Set the version to `10.4.0`
add 9debe4e Update the `project.build.outputTimestamp` property
add 08224ec Release changelog for version `10.4.0`
add 87b97a9 Fix changelog
add e45457c Update the `project.build.outputTimestamp` property
new 97b2aad Set the version to `10.5.0-SNAPSHOT`
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 ++--
.../update_com_github_spotbugs_spotbugs_annotations.xml | 8
.../update_com_github_spotbugs_spotbugs_maven_plugin.xml | 8
...ate_org_apache_maven_plugins_maven_artifact_plugin.xml | 7 ---
src/changelog/{.10.x.x => 10.4.0}/.release-notes.adoc.ftl | 0
src/changelog/{10.3.0 => 10.4.0}/.release.xml | 2 +-
.../{.10.x.x => 10.4.0}/add-deterministic-formatter.xml | 0
.../{.10.x.x => 10.4.0}/increase-file-walk-depth.xml | 0
src/site/_constants.adoc | 2 +-
src/site/_release-notes.adoc | 2 +-
.../_release-notes/_10.4.0.adoc} | 15 +++
src/site/_release-notes/_10.x.x.adoc | 11 ---
12 files changed, 16 insertions(+), 43 deletions(-)
delete mode 100644
src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_annotations.xml
delete mode 100644
src/changelog/.10.x.x/update_com_github_spotbugs_spotbugs_maven_plugin.xml
delete mode 100644
src/changelog/.10.x.x/update_org_apache_maven_plugins_maven_artifact_plugin.xml
copy src/changelog/{.10.x.x => 10.4.0}/.release-notes.adoc.ftl (100%)
copy src/changelog/{10.3.0 => 10.4.0}/.release.xml (96%)
rename src/changelog/{.10.x.x => 10.4.0}/add-deterministic-formatter.xml (100%)
rename src/changelog/{.10.x.x => 10.4.0}/increase-file-walk-depth.xml (100%)
copy src/{changelog/.10.x.x/.release-notes.adoc.ftl =>
site/_release-notes/_10.4.0.adoc} (90%)
(logging-parent) annotated tag rel/10.4.0 updated (e45457c -> 3b98c69)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to annotated tag rel/10.4.0 in repository https://gitbox.apache.org/repos/asf/logging-parent.git *** WARNING: tag rel/10.4.0 was modified! *** from e45457c (commit) to 3b98c69 (tag) tagging e45457c683302242be5e8e7c3c33edf8f0e0ec0e (commit) replaces rel/10.3.0 by Volkan Yazıcı on Tue Nov 14 22:22:23 2023 +0100 - Log - 10.4.0 -BEGIN PGP SIGNATURE- iQEzBAABCgAdFiEE8aX8gXYUJVqORBqa031Dh8m9No4FAmVT5Q8ACgkQ031Dh8m9 No5v/AgA5JEhDBCotvbDO+bpCssz0TrYXUjtA5UZbQL8hI/TOLaXl1f/NwO5AKDA Lp8Fr9+hdeZ4vK2CoeHbaRNE5p4G+Rb69f9EepCE5Tu8ron4RUHP6oMWSQfmR9Ym /9sKIGRdB95zqXshHgPUTk1nNZekxND5GXOMVl0SGckr2y4XPVJVR2NrUGw/dOFB btyYzF8XC3evS6YCqjzUb5tfp9Yt7Oq8qKr8mVQbhV/lrRrndsX2mtrHO7y47Xpz h8JI0yWOqVm2BXNH43Igg9oIXDc4LscXac4N2RY3HCHERhow6d7WywF5KNxW9K3V BIYJ1AVi4lTxIN9yPcZ/e0gnQfURdw== =ztob -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
(logging-site) branch asf-site updated (4b79b098 -> a883dfd0)
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-site.git from 4b79b098 Automatic Site Publish by Buildbot add a883dfd0 Automatic Site Publish by Buildbot No new revisions were added by this update. Summary of changes: content/blog/2023/10/11/release.html| 12 ++-- content/blog/index.html | 12 ++-- content/charter.html| 12 ++-- content/dormant.html| 18 +- content/feed.xml| 2 +- content/guidelines.html | 12 ++-- content/index.html | 22 +++--- content/mailing-lists.html | 12 ++-- content/security.html | 12 ++-- content/security/index.html | 12 ++-- content/security/known-vulnerabilities.html | 12 ++-- content/support.html| 12 ++-- content/team-list.html | 12 ++-- content/what-is-logging.html| 12 ++-- 14 files changed, 87 insertions(+), 87 deletions(-)
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new a883dfd0 Automatic Site Publish by Buildbot a883dfd0 is described below commit a883dfd08bf7483e16032c89f1adba3ccf42bb65 Author: buildbot AuthorDate: Tue Nov 14 20:52:23 2023 + Automatic Site Publish by Buildbot --- content/blog/2023/10/11/release.html| 12 ++-- content/blog/index.html | 12 ++-- content/charter.html| 12 ++-- content/dormant.html| 18 +- content/feed.xml| 2 +- content/guidelines.html | 12 ++-- content/index.html | 22 +++--- content/mailing-lists.html | 12 ++-- content/security.html | 12 ++-- content/security/index.html | 12 ++-- content/security/known-vulnerabilities.html | 12 ++-- content/support.html| 12 ++-- content/team-list.html | 12 ++-- content/what-is-logging.html| 12 ++-- 14 files changed, 87 insertions(+), 87 deletions(-) diff --git a/content/blog/2023/10/11/release.html b/content/blog/2023/10/11/release.html index 306c49d8..50a01c88 100644 --- a/content/blog/2023/10/11/release.html +++ b/content/blog/2023/10/11/release.html @@ -40,15 +40,15 @@ -Apache Log4j™ +Apache Log4j® -Apache Log4j™ for Kotlin +Apache Log4j® for Kotlin -Apache Log4j™ for Scala +Apache Log4j® for Scala @@ -60,7 +60,7 @@ -Apache Log4j Audit +Apache Log4j® Audit @@ -96,11 +96,11 @@ -Apache Log4j 1.x +Apache Log4j® 1.x -Apache log4j 1 extras +Apache log4j® 1 extras diff --git a/content/blog/index.html b/content/blog/index.html index a52bff02..3075f999 100644 --- a/content/blog/index.html +++ b/content/blog/index.html @@ -40,15 +40,15 @@ -Apache Log4j™ +Apache Log4j® -Apache Log4j™ for Kotlin +Apache Log4j® for Kotlin -Apache Log4j™ for Scala +Apache Log4j® for Scala @@ -60,7 +60,7 @@ -Apache Log4j Audit +Apache Log4j® Audit @@ -96,11 +96,11 @@ -Apache Log4j 1.x +Apache Log4j® 1.x -Apache log4j 1 extras +Apache log4j® 1 extras diff --git a/content/charter.html b/content/charter.html index e8440823..4edc50ed 100644 --- a/content/charter.html +++ b/content/charter.html @@ -40,15 +40,15 @@ -Apache Log4j™ +Apache Log4j®
(logging-site) branch jekyll updated: added ® instead of TM
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new 789af241 added ® instead of TM 789af241 is described below commit 789af241de494945953230fe8d4229336863563e Author: Christian Grobmeier AuthorDate: Tue Nov 14 21:52:05 2023 +0100 added ® instead of TM --- _data/projects.yml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/_data/projects.yml b/_data/projects.yml index f62e98fa..c76c46e8 100644 --- a/_data/projects.yml +++ b/_data/projects.yml @@ -1,12 +1,12 @@ -- name: Apache Log4j™ +- name: Apache Log4j® description: Log4j 2 provides both a portable logging API and implementation for Java with significant improvements over its predecessor, Log4j 1.x. url: /log4j/2.x/index.html status: active -- name: Apache Log4j™ for Kotlin +- name: Apache Log4j® for Kotlin description: Kotlin API for Log4j 2. url: /log4j/kotlin/index.html status: active -- name: Apache Log4j™ for Scala +- name: Apache Log4j® for Scala description: Scala API for Log4j 2. url: /log4j/scala/index.html status: active @@ -18,19 +18,19 @@ description: A GUI based log viewer. Chainsaw is a companion application to log4j written by members of the log4j development community. url: /chainsaw/2.x/index.html status: active -- name: Apache Log4j Audit - description: Audit logging framework built upon Apache Log4j 2. +- name: Apache Log4j® Audit + description: Audit logging framework built upon Apache Log4j® 2. url: /log4j-audit/latest/index.html status: active - name: Apache Log4Net description: A port of the original Apache log4j framework to the Microsoft .NET runtime. url: /log4net status: active -- name: Apache Log4j 1.x - description: The original Log4j. Reached End-Of-Life August 2015. +- name: Apache Log4j® 1.x + description: The original Log4j®. Reached End-Of-Life August 2015. url: /log4j/1.2/index.html status: dormant -- name: Apache log4j 1 extras +- name: Apache log4j® 1 extras description: Extras for log4j 1.x, like companions, receivers and more. url: /log4j/extras/index.html status: dormant
(logging-site) branch asf-site updated (6bcadad6 -> 4b79b098)
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-site.git discard 6bcadad6 Merge branch 'asf-site' of github.com:apache/logging-site into asf-site discard e2fd09b1 Merge branch 'asf-site' of github.com:apache/logging-site into asf-site omit 9369660f created doap file for log4j omit 37324003 Make `vy` the PMC chair add 4b79b098 Automatic Site Publish by Buildbot This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (6bcadad6) \ N -- N -- N refs/heads/asf-site (4b79b098) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: content/blog/2023/10/11/release.html| 9 - content/blog/index.html | 9 - content/charter.html| 9 - content/dormant.html| 9 - content/feed.xml| 2 +- content/guidelines.html | 9 - content/index.html | 9 - content/mailing-lists.html | 9 - content/security.html | 9 - content/security/index.html | 9 - content/security/known-vulnerabilities.html | 9 - content/support.html| 9 - content/team-list.html | 9 - content/what-is-logging.html| 9 - 14 files changed, 53 insertions(+), 66 deletions(-)
(logging-site) 01/01: Merge branch 'asf-site' of github.com:apache/logging-site into asf-site
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/logging-site.git commit 6bcadad6046b9ade0f56893b289a452bb8ed0641 Merge: e2287322 e2fd09b1 Author: Christian Grobmeier AuthorDate: Tue Nov 14 21:43:10 2023 +0100 Merge branch 'asf-site' of github.com:apache/logging-site into asf-site
(logging-site) branch asf-site updated (e2fd09b1 -> 6bcadad6)
This is an automated email from the ASF dual-hosted git repository.
grobmeier pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/logging-site.git
from e2fd09b1 Merge branch 'asf-site' of github.com:apache/logging-site
into asf-site
add e2287322 Automatic Site Publish by Buildbot
new 6bcadad6 Merge branch 'asf-site' of github.com:apache/logging-site
into asf-site
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
content/blog/2023/10/11/release.html | 14 +-
content/blog/index.html| 14 +-
content/charter.html | 14 +-
content/dormant.html | 14 +-
content/feed.xml | 2 +-
content/guidelines.html| 14 +-
content/index.html | 14 +-
content/mailing-lists.html | 14 +-
content/security.html | 14 +-
.../10/11/release.html => security/index.html} | 115 +++-
content/security/known-vulnerabilities.html| 644 +
content/support.html | 426 ++
content/team-list.html | 14 +-
content/what-is-logging.html | 14 +-
14 files changed, 1285 insertions(+), 42 deletions(-)
copy content/{blog/2023/10/11/release.html => security/index.html} (59%)
create mode 100644 content/security/known-vulnerabilities.html
create mode 100644 content/support.html
(logging-site) branch activity-monitor updated: updated footer to reflect some trademarks are registered
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch activity-monitor in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/activity-monitor by this push: new ffd0b7f7 updated footer to reflect some trademarks are registered ffd0b7f7 is described below commit ffd0b7f770bbfc42200bae47c46cdbc5c040ef8e Author: Christian Grobmeier AuthorDate: Tue Nov 14 21:39:14 2023 +0100 updated footer to reflect some trademarks are registered --- index.html | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 44123fc9..4652f651 100644 --- a/index.html +++ b/index.html @@ -86,14 +86,13 @@ Licensed under the https://www.apache.org/licenses/LICENSE-2.0; target="external">Apache Software License, Version 2.0 Please read our https://privacy.apache.org/policies/privacy-policy-public.html;>privacy policy. -Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache -feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks +Apache, chainsaw, log4cxx, Log4j, Log4net, log4php and the Apache +feather logo are trademarks or registered trademarks of The Apache +Software Foundation. +Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. - -Site powered by https://getbootstrap.com/; target="external">Bootstrap -and https://jquery.com/; target="external">jQuery. - +
(logging-site) branch asf-staging updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/asf-staging by this push: new 4b79b098 Automatic Site Publish by Buildbot 4b79b098 is described below commit 4b79b098a2c9ba20369541a2a895733926282507 Author: buildbot AuthorDate: Tue Nov 14 20:38:12 2023 + Automatic Site Publish by Buildbot --- content/blog/2023/10/11/release.html| 9 - content/blog/index.html | 9 - content/charter.html| 9 - content/dormant.html| 9 - content/feed.xml| 2 +- content/guidelines.html | 9 - content/index.html | 9 - content/mailing-lists.html | 9 - content/security.html | 9 - content/security/index.html | 9 - content/security/known-vulnerabilities.html | 9 - content/support.html| 9 - content/team-list.html | 9 - content/what-is-logging.html| 9 - 14 files changed, 53 insertions(+), 66 deletions(-) diff --git a/content/blog/2023/10/11/release.html b/content/blog/2023/10/11/release.html index 1f3f03f6..306c49d8 100644 --- a/content/blog/2023/10/11/release.html +++ b/content/blog/2023/10/11/release.html @@ -183,12 +183,11 @@ Licensed under the https://www.apache.org/licenses/LICENSE-2.0; target="external">Apache Software License, Version 2.0 Please read our https://privacy.apache.org/policies/privacy-policy-public.html;>privacy policy. -Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache -feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks +Apache, chainsaw, log4cxx, Log4j, Log4net, log4php and the Apache +feather logo are trademarks or registered trademarks of The Apache +Software Foundation. +Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. - -Site powered by https://getbootstrap.com/; target="external">Bootstrap -and https://jquery.com/; target="external">jQuery. diff --git a/content/blog/index.html b/content/blog/index.html index aec62493..a52bff02 100644 --- a/content/blog/index.html +++ b/content/blog/index.html @@ -181,12 +181,11 @@ Licensed under the https://www.apache.org/licenses/LICENSE-2.0; target="external">Apache Software License, Version 2.0 Please read our https://privacy.apache.org/policies/privacy-policy-public.html;>privacy policy. -Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache -feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks +Apache, chainsaw, log4cxx, Log4j, Log4net, log4php and the Apache +feather logo are trademarks or registered trademarks of The Apache +Software Foundation. +Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. - -Site powered by https://getbootstrap.com/; target="external">Bootstrap -and https://jquery.com/; target="external">jQuery. diff --git a/content/charter.html b/content/charter.html index 720f854c..e8440823 100644 --- a/content/charter.html +++ b/content/charter.html @@ -192,12 +192,11 @@ Licensed under the https://www.apache.org/licenses/LICENSE-2.0; target="external">Apache Software License, Version 2.0 Please read our https://privacy.apache.org/policies/privacy-policy-public.html;>privacy policy. -Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache -feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks +Apache, chainsaw, log4cxx, Log4j, Log4net, log4php and the Apache +feather logo are trademarks or registered trademarks of The Apache +Software Foundation. +Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. - -Site powered by https://getbootstrap.com/; target="external">Bootstrap -and https://jquery.com/; target="external">jQuery.
(logging-site) branch jekyll updated: added new footer text for newly registered trademark
This is an automated email from the ASF dual-hosted git repository. grobmeier pushed a commit to branch jekyll in repository https://gitbox.apache.org/repos/asf/logging-site.git The following commit(s) were added to refs/heads/jekyll by this push: new 6c5d063a added new footer text for newly registered trademark 6c5d063a is described below commit 6c5d063ad18dd827af09a921a9b7759357081a23 Author: Christian Grobmeier AuthorDate: Tue Nov 14 21:37:55 2023 +0100 added new footer text for newly registered trademark --- _includes/footer.html | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 7f82a9f3..53f8f90e 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,11 +5,10 @@ Licensed under the https://www.apache.org/licenses/LICENSE-2.0; target="external">Apache Software License, Version 2.0 Please read our https://privacy.apache.org/policies/privacy-policy-public.html;>privacy policy. -Apache, Apache chainsaw, Apache log4cxx, Apache log4j, Apache log4net, Apache log4php and the Apache -feather logo are trademarks of The Apache Software Foundation. Oracle and Java are registered trademarks +Apache, chainsaw, log4cxx, Log4j, Log4net, log4php and the Apache +feather logo are trademarks or registered trademarks of The Apache +Software Foundation. +Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners. - -Site powered by https://getbootstrap.com/; target="external">Bootstrap -and https://jquery.com/; target="external">jQuery.
(logging-log4j-server) branch dependabot/maven/log4j-server/com.fasterxml.woodstox-woodstox-core-5.4.0 deleted (was 329c3ad)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/log4j-server/com.fasterxml.woodstox-woodstox-core-5.4.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j-server.git was 329c3ad Bump woodstox-core from 5.0.2 to 5.4.0 in /log4j-server The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j-server) branch master updated: Document move to `logging-log4j-samples`
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j-server.git The following commit(s) were added to refs/heads/master by this push: new d65d80c Document move to `logging-log4j-samples` d65d80c is described below commit d65d80c1f67128380409048f7397b65c14163d77 Author: Piotr P. Karwasz AuthorDate: Tue Nov 14 16:24:38 2023 +0100 Document move to `logging-log4j-samples` --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 000..1b7b9b4 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# logging-log4j-server + +The contents of this repository have been moved to the [Log4j Samples Repository](https://github.com/apache/logging-log4j-samples).
(logging-log4j2) 03/03: [LOG4J2-1362] Create a YAML layout (part)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 945cb7fecb48b35d16e375db58d8cda5dfd414e5
Author: ggregory
AuthorDate: Sun Apr 17 15:27:19 2016 -0700
[LOG4J2-1362] Create a YAML layout (part)
Cherry-pick of an old commit that introduced:
`ServletRequestThreadContext`
---
.../log4j/web/ServletRequestThreadContext.java | 45 ++
1 file changed, 45 insertions(+)
diff --git
a/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java
b/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java
new file mode 100644
index 00..2efb448f5b
--- /dev/null
+++
b/log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java
@@ -0,0 +1,45 @@
+/*
+ * 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.web;
+
+import java.util.Objects;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.logging.log4j.ThreadContext;
+
+public class ServletRequestThreadContext {
+
+public static void put(String key, ServletRequest servletRequest) {
+put(key, "RemoteAddr", servletRequest.getRemoteAddr());
+put(key, "RemoteHost", servletRequest.getRemoteHost());
+put(key, "RemotePort", servletRequest.getRemotePort());
+}
+
+public static void put(String key, String field, Object value) {
+put(key + "." + field, Objects.toString(value));
+}
+
+public static void put(String key, String value) {
+ThreadContext.put(key, value);
+}
+
+public static void put(String key, HttpServletRequest servletRequest) {
+put(key, (ServletRequest) servletRequest);
+}
+}
(logging-log4j2) 02/03: [LOG4J2-708] Improve `Log4jServletFilter` async behavior
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit aada21dae6a5db33951ed91663355907dad918a0
Author: Piotr P. Karwasz
AuthorDate: Sun Sep 11 15:18:44 2022 +0200
[LOG4J2-708] Improve `Log4jServletFilter` async behavior
The `Log4jServletFilter` filter should run on all the threads a request
is run. The current version ignores all async dispatches.
---
.../src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java | 2 ++
.../test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java | 1 +
2 files changed, 3 insertions(+)
diff --git
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java
index a15584dec9..af17d5da7b 100644
---
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java
+++
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletFilter.java
@@ -87,6 +87,8 @@ public class Log4jServletFilter implements Filter {
} finally {
this.initializer.clearLoggerContext();
CURRENT_REQUEST.remove();
+// Execute once per thread
+request.removeAttribute(ALREADY_FILTERED_ATTRIBUTE);
}
}
}
diff --git
a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java
b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java
index 07a1fb4340..5a891cce62 100644
---
a/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java
+++
b/log4j-web/src/test/java/org/apache/logging/log4j/web/Log4jServletFilterTest.java
@@ -93,6 +93,7 @@ public class Log4jServletFilterTest {
then(chain).should().doFilter(same(request), same(response));
then(chain).shouldHaveNoMoreInteractions();
then(initializer).should().clearLoggerContext();
+
then(request).should().removeAttribute(Log4jServletFilter.ALREADY_FILTERED_ATTRIBUTE);
}
@Test
(logging-log4j2) 01/03: Allow multiple Log4jServletContextListener registrations
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 05cd238b63ba4167760b5cb0293fd2fd145e4856
Author: Piotr P. Karwasz
AuthorDate: Mon Sep 11 13:11:37 2023 +0200
Allow multiple Log4jServletContextListener registrations
This closes #1782.
---
.../log4j/web/Log4jServletContextListener.java | 64
.../log4j/web/Log4jServletContextListenerTest.java | 88 ++
...w_multiple_servletcontextlistener_instances.xml | 28 +++
3 files changed, 133 insertions(+), 47 deletions(-)
diff --git
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
index 56020841c2..903deb9bc4 100644
---
a/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
+++
b/log4j-web/src/main/java/org/apache/logging/log4j/web/Log4jServletContextListener.java
@@ -35,6 +35,8 @@ import static
org.apache.logging.log4j.util.Strings.toRootUpperCase;
*/
public class Log4jServletContextListener implements ServletContextListener {
+static final String START_COUNT_ATTR =
Log4jServletContextListener.class.getName() + ".START_COUNT";
+
static final int DEFAULT_STOP_TIMEOUT = 30;
static final TimeUnit DEFAULT_STOP_TIMEOUT_TIMEUNIT = TimeUnit.SECONDS;
@@ -46,11 +48,30 @@ public class Log4jServletContextListener implements
ServletContextListener {
private ServletContext servletContext;
private Log4jWebLifeCycle initializer;
+private int getAndIncrementCount() {
+Integer count = (Integer)
servletContext.getAttribute(START_COUNT_ATTR);
+if (count == null) {
+count = 0;
+}
+servletContext.setAttribute(START_COUNT_ATTR, count + 1);
+return count;
+}
+
+private int decrementAndGetCount() {
+Integer count = (Integer)
servletContext.getAttribute(START_COUNT_ATTR);
+if (count == null) {
+LOGGER.warn(
+"{} received a 'contextDestroyed' message without a
corresponding 'contextInitialized' message.",
+getClass().getName());
+count = 1;
+}
+servletContext.setAttribute(START_COUNT_ATTR, --count);
+return count;
+}
+
@Override
public void contextInitialized(final ServletContextEvent event) {
this.servletContext = event.getServletContext();
-LOGGER.debug("Log4jServletContextListener ensuring that Log4j starts
up properly.");
-
if ("true".equalsIgnoreCase(servletContext.getInitParameter(
Log4jWebSupport.IS_LOG4J_AUTO_SHUTDOWN_DISABLED))) {
throw new IllegalStateException("Do not use " +
getClass().getSimpleName() + " when "
@@ -60,6 +81,12 @@ public class Log4jServletContextListener implements
ServletContextListener {
}
this.initializer =
WebLoggerContextUtils.getWebLifeCycle(this.servletContext);
+if (getAndIncrementCount() != 0) {
+LOGGER.debug("Skipping Log4j context initialization, since {} is
registered multiple times.",
+getClass().getSimpleName());
+return;
+}
+LOGGER.info("{} triggered a Log4j context initialization.",
getClass().getSimpleName());
try {
this.initializer.start();
this.initializer.setLoggerContext(); // the application is just
now starting to start up
@@ -71,19 +98,28 @@ public class Log4jServletContextListener implements
ServletContextListener {
@Override
public void contextDestroyed(final ServletContextEvent event) {
if (this.servletContext == null || this.initializer == null) {
-LOGGER.warn("Context destroyed before it was initialized.");
+LOGGER.warn("Servlet context destroyed before it was
initialized.");
+return;
+}
+
+if (decrementAndGetCount() != 0) {
+LOGGER.debug("Skipping Log4j context shutdown, since {} is
registered multiple times.",
+getClass().getSimpleName());
return;
}
-LOGGER.debug("Log4jServletContextListener ensuring that Log4j shuts
down properly.");
-
-this.initializer.clearLoggerContext(); // the application is finished
-// shutting down now
-final String stopTimeoutStr =
servletContext.getInitParameter(KEY_STOP_TIMEOUT);
-final long stopTimeout = Strings.isEmpty(stopTimeoutStr) ?
DEFAULT_STOP_TIMEOUT
-: Long.parseLong(stopTimeoutStr);
-final String timeoutTimeUnitStr =
servletContext.getInitParameter(KEY_STOP_TIMEOUT_TIMEUNIT);
-final TimeUnit timeoutTimeUnit = Strings.isEmpty(timeoutTimeUnitStr) ?
DEFAULT_STOP_TIMEOUT_TIMEUNIT
-:
(logging-log4j2) branch main updated (c4882c0408 -> 945cb7fecb)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from c4882c0408 Initial draft of the Recycler API (#1401)
new 05cd238b63 Allow multiple Log4jServletContextListener registrations
new aada21dae6 [LOG4J2-708] Improve `Log4jServletFilter` async behavior
new 945cb7fecb [LOG4J2-1362] Create a YAML layout (part)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../log4j/web/Log4jServletContextListener.java | 64
.../logging/log4j/web/Log4jServletFilter.java | 2 +
.../log4j/web/ServletRequestThreadContext.java | 12 +--
.../log4j/web/Log4jServletContextListenerTest.java | 88 ++
.../logging/log4j/web/Log4jServletFilterTest.java | 1 +
..._multiple_servletcontextlistener_instances.xml} | 5 +-
6 files changed, 117 insertions(+), 55 deletions(-)
copy {log4j-jakarta-web =>
log4j-web}/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java
(76%)
copy src/changelog/.3.x.x/{1589_mongodb_tests.xml =>
1782_allow_multiple_servletcontextlistener_instances.xml} (84%)
(logging-log4j-samples) branch main updated (f6986ba -> 2d36363)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git from f6986ba Adds `log4j-server` to the build add 9927b13 Fix compilation problems add 8c8bf11 Restore compilability add ae1df46 Disable test compilation, execution and Spotbugs add 2d36363 Spotless No new revisions were added by this update. Summary of changes: log4j-server/pom.xml | 10 ++ .../log4j/server/AbstractLogEventBridge.java | 12 +- .../logging/log4j/server/AbstractSocketServer.java | 10 +- .../log4j/server/InputStreamLogEventBridge.java| 14 +-- .../org/apache/logging/log4j/server/JmsServer.java | 17 ++- .../server/JsonInputStreamLogEventBridge.java | 14 +-- .../logging/log4j/server/LogEventBridge.java | 18 +-- .../server/ObjectInputStreamLogEventBridge.java| 11 +- .../log4j/server/SecureTcpSocketServer.java| 16 +-- .../logging/log4j/server/TcpSocketServer.java | 70 ++- .../logging/log4j/server/UdpSocketServer.java | 38 +++--- .../log4j/server/XmlInputStreamLogEventBridge.java | 10 +- .../log4j/server/mom/jms/AbstractJmsReceiver.java | 13 +-- .../log4j/server/mom/jms/JmsQueueReceiver.java | 11 +- .../log4j/server/mom/jms/JmsTopicReceiver.java | 11 +- log4j-server/src/site/site.xml | 32 ++--- .../log4j/server/AbstractSocketServerTest.java | 20 ++-- .../log4j/server/SslXmlSocketServerTest.java | 12 +- .../log4j/server/TcpJsonSocketServerTest.java | 12 +- .../log4j/server/TcpXmlSocketServerTest.java | 12 +- .../logging/log4j/server/ThreadIdFilter.java | 13 +-- .../logging/log4j/server/ThreadNameFilter.java | 13 +-- .../logging/log4j/server/ThreadPriorityFilter.java | 13 +-- .../log4j/server/UdpJsonSocketServerTest.java | 10 +- .../log4j/server/UdpXmlSocketServerTest.java | 10 +- .../mom/activemq/ActiveMqBrokerServiceHelper.java | 11 +- .../mom/activemq/ActiveMqBrokerServiceRule.java| 129 ++--- .../log4j/server/mom/jms/JmsQueueReceiverTest.java | 10 +- 28 files changed, 291 insertions(+), 281 deletions(-)
(logging-log4j-samples) branch dependabot/maven/org.eclipse.jetty-jetty-maven-plugin-10.0.18 updated (0337f67 -> 02c62ec)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.eclipse.jetty-jetty-maven-plugin-10.0.18 in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git discard 0337f67 Bump org.eclipse.jetty:jetty-maven-plugin from 10.0.17 to 10.0.18 add e958683 Disable reproducibility check of JLink sample add c570e26 Relax Java requirements, but bump to JDK 21 on CI add fe38410 Ignore Disruptor 4.x bumps add b88226d Bump Maven Artifact Plugin to version 3.5.0 add 80670c4 Disable comparison of JLink sample in aggregate run add 400f240 Move log4j-server to Tools repo add 42080af LOG4J2-1851 Move server components from core to new server module add 65fb4b0 LOG4J2-1958 Read JSON log event by default in TCP and UDP servers add 34333dc Bump version to 2.9-SNAPSHOT add 73c1b07 Match log4j-core 2.9-SNAPSHOT add a793656 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. add 24b9e92 Remove useless extra parens. add 50273e7 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment. add a529f8c [LOG4J2-1311] SocketAppender will lose several events after re-connection to server. add c0f8286 Intentionally break compilation to indicate this needs to be fixed add 23c3345 Update JMS Server to match updated Appender. Move some classes ActiveMQ JUnit test rule in this module from the Core module. This is to avoid a dependency cycle. add e04dd46 create test-jar, which is used by the log4j-core-its module add 17c384b Closes 1 add 92a91f7 Closes #1 add 3548827 Better Javadoc and minor clean up. add da9ba93 Better Javadoc and minor clean up. add 4e67f54 LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency add ecc4cef LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency add 4e8bde3 LOG4J2-2011 moved classes from util.picocli to tools.picocli add 770e4d0 Add util methods for tests. add c60690d Add toString(). add a2d1da6 Add toString(). add 74c968c Formatting. add 3aa488f Upgrade to latest Log4j add 5df0bc2 LOG4J2-2163 Use FilteredObjectInputStream from log4j-api add 2f3a5fa LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge add dcba7af Fix typo add 672a155 Fixes to match the main repo at 2.11.1-SNAPSHOT. add 65b62e2 Updates for 3.0.0 modules. add 9d9512b [LOG4J2-2493] Remove deprecated code. Still a bit more to do. add fbbe52b [LOG4J2-2493] Remove deprecated code. Still a bit more to do. add 0824a07 [LOG4J2-2493] Remove deprecated code. Still a bit more to do. add 66c8fe7 Move Log4j Server to its own repo add 5c0e12f Restore files add 9b5372a Upgrade vulnerable dependencies add f6986ba Adds `log4j-server` to the build add 02c62ec Bump org.eclipse.jetty:jetty-maven-plugin from 10.0.17 to 10.0.18 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0337f67) \ N -- N -- N refs/heads/dependabot/maven/org.eclipse.jetty-jetty-maven-plugin-10.0.18 (02c62ec) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .github/dependabot.yaml| 3 + .github/workflows/build.yaml | 2 + .github/workflows/merge-dependabot.yaml| 2 + log4j-samples-asynclogger/pom.xml | 4 - log4j-samples-jlink/pom.xml| 7 +- .../pom.xml| 129 .../log4j/server/AbstractLogEventBridge.java | 28 ++ .../logging/log4j/server/AbstractSocketServer.java | 217 + .../log4j/server/InputStreamLogEventBridge.java| 108 +++ .../org/apache/logging/log4j/server/JmsServer.java | 149 + .../server/JsonInputStreamLogEventBridge.java | 89 ++ .../logging/log4j/server/LogEventBridge.java | 56 .../server/ObjectInputStreamLogEventBridge.java| 69 + .../log4j/server/SecureTcpSocketServer.java| 41 +++ .../logging/log4j/server/TcpSocketServer.java | 341 +
(logging-log4j-samples) branch main updated: Adds `log4j-server` to the build
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
The following commit(s) were added to refs/heads/main by this push:
new f6986ba Adds `log4j-server` to the build
f6986ba is described below
commit f6986baea723908d038977ddf80f5ebf0e1a77a9
Author: Piotr P. Karwasz
AuthorDate: Tue Nov 14 14:20:41 2023 +0100
Adds `log4j-server` to the build
---
log4j-server/pom.xml | 192 +--
pom.xml | 25 +--
2 files changed, 54 insertions(+), 163 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index c95fdb2..284c9aa 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -3,11 +3,11 @@
~ 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 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
+ ~ 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,
@@ -18,57 +18,60 @@
http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
-org.apache.logging.log4j
-log4j-tools
-3.0.0-SNAPSHOT
-../
+org.apache.logging.log4j.samples
+log4j-samples
+${revision}
+
log4j-server
jar
Apache Log4j Server components
The Apache Log4j server components
+
-${basedir}/..
-/log4j-server
+3.0.0-SNAPSHOT
+
+
+
+ javax.jms
+ javax.jms-api
+ provided
+
+
org.apache.logging.log4j
log4j-core
+
org.apache.logging.log4j
log4j-jms
- ${project.version}
+
org.apache.logging.log4j
log4j-layout-jackson-json
- ${project.version}
+
org.apache.logging.log4j
log4j-layout-jackson-xml
- ${project.version}
-
-
-
- org.jboss.spec.javax.jms
- jboss-jms-api_1.1_spec
- provided
- true
+
com.fasterxml.jackson.core
jackson-databind
+
com.fasterxml.jackson.dataformat
jackson-dataformat-xml
-
+
com.fasterxml.woodstox
woodstox-core
@@ -77,165 +80,36 @@
+
+ org.apache.activemq
+ activemq-broker
+ test
+
+
org.apache.logging.log4j
log4j-core-test
test
+
junit
junit
test
+
org.hamcrest
- hamcrest-all
+ hamcrest
test
+
org.mockito
mockito-core
test
-
- org.apache.activemq
- activemq-broker
- test
-
+
-
-
-
-
-org.apache.maven.plugins
-maven-remote-resources-plugin
-
-
-
- process
-
-
- false
-
-
-
-
-
-org.apache.felix
-maven-bundle-plugin
-
-
-
org.apache.logging.log4j.core.net.*
-
-
-
-
-org.apache.maven.plugins
-maven-jar-plugin
-
-
-
- test-jar
-
-
-
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-changes-plugin
-${changes.plugin.version}
-
-
-
- changes-report
-
-
-
-
- %URL%/show_bug.cgi?id=%ISSUE%
- true
-
-
-
-org.apache.maven.plugins
-maven-checkstyle-plugin
-${checkstyle.plugin.version}
-
-
- ${log4jParentDir}/checkstyle.xml
-
${log4jParentDir}/checkstyle-suppressions.xml
- false
- basedir=${basedir}
-
licensedir=${log4jParentDir}/checkstyle-header.txt
-
-
-
-org.apache.maven.plugins
-maven-javadoc-plugin
-${javadoc.plugin.version}
-
-
-
- false
- true
-
-
-
-non-aggregate
-
- javadoc
-
-
-
-
-
-
(logging-log4j-samples) branch merge-server deleted (was 9b5372a)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git was 9b5372a Upgrade vulnerable dependencies The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j-samples) branch main updated (80670c4 -> 9b5372a)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git from 80670c4 Disable comparison of JLink sample in aggregate run add 400f240 Move log4j-server to Tools repo add 42080af LOG4J2-1851 Move server components from core to new server module add 65fb4b0 LOG4J2-1958 Read JSON log event by default in TCP and UDP servers add 34333dc Bump version to 2.9-SNAPSHOT add 73c1b07 Match log4j-core 2.9-SNAPSHOT add a793656 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. add 24b9e92 Remove useless extra parens. add 50273e7 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment. add a529f8c [LOG4J2-1311] SocketAppender will lose several events after re-connection to server. add c0f8286 Intentionally break compilation to indicate this needs to be fixed add 23c3345 Update JMS Server to match updated Appender. Move some classes ActiveMQ JUnit test rule in this module from the Core module. This is to avoid a dependency cycle. add e04dd46 create test-jar, which is used by the log4j-core-its module add 17c384b Closes 1 add 92a91f7 Closes #1 add 3548827 Better Javadoc and minor clean up. add da9ba93 Better Javadoc and minor clean up. add 4e67f54 LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency add ecc4cef LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency add 4e8bde3 LOG4J2-2011 moved classes from util.picocli to tools.picocli add 770e4d0 Add util methods for tests. add c60690d Add toString(). add a2d1da6 Add toString(). add 74c968c Formatting. add 3aa488f Upgrade to latest Log4j add 5df0bc2 LOG4J2-2163 Use FilteredObjectInputStream from log4j-api add 2f3a5fa LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge add dcba7af Fix typo add 672a155 Fixes to match the main repo at 2.11.1-SNAPSHOT. add 65b62e2 Updates for 3.0.0 modules. add 9d9512b [LOG4J2-2493] Remove deprecated code. Still a bit more to do. add fbbe52b [LOG4J2-2493] Remove deprecated code. Still a bit more to do. add 0824a07 [LOG4J2-2493] Remove deprecated code. Still a bit more to do. add 66c8fe7 Move Log4j Server to its own repo add 5c0e12f Restore files add 9b5372a Upgrade vulnerable dependencies No new revisions were added by this update. Summary of changes: log4j-server/pom.xml | 241 +++ .../log4j/server/AbstractLogEventBridge.java | 28 ++ .../logging/log4j/server/AbstractSocketServer.java | 217 + .../log4j/server/InputStreamLogEventBridge.java| 108 +++ .../org/apache/logging/log4j/server/JmsServer.java | 149 + .../server/JsonInputStreamLogEventBridge.java | 89 ++ .../logging/log4j/server/LogEventBridge.java | 56 .../server/ObjectInputStreamLogEventBridge.java| 69 + .../log4j/server/SecureTcpSocketServer.java| 41 +++ .../logging/log4j/server/TcpSocketServer.java | 341 + .../logging/log4j/server/UdpSocketServer.java | 167 ++ .../log4j/server/XmlInputStreamLogEventBridge.java | 54 .../log4j/server/mom/jms/AbstractJmsReceiver.java | 69 + .../log4j/server/mom/jms/JmsQueueReceiver.java | 46 +++ .../log4j/server/mom/jms/JmsTopicReceiver.java | 46 +++ .../logging/log4j/server/mom/jms/package-info.java | 10 + .../apache/logging/log4j/server/package-info.java | 8 + log4j-server/src/site/markdown/index.md| 30 ++ log4j-server/src/site/site.xml | 52 .../log4j/server/AbstractSocketServerTest.java | 240 +++ .../log4j/server/SslXmlSocketServerTest.java | 103 +++ .../log4j/server/TcpJsonSocketServerTest.java | 62 .../log4j/server/TcpXmlSocketServerTest.java | 65 .../logging/log4j/server/ThreadIdFilter.java | 24 ++ .../logging/log4j/server/ThreadNameFilter.java | 23 ++ .../logging/log4j/server/ThreadPriorityFilter.java | 24 ++ .../log4j/server/UdpJsonSocketServerTest.java | 58 .../log4j/server/UdpXmlSocketServerTest.java | 61 .../mom/activemq/ActiveMqBrokerServiceHelper.java | 51 +++ .../mom/activemq/ActiveMqBrokerServiceRule.java| 94 ++ .../log4j/server/mom/jms/JmsQueueReceiverTest.java | 42 +++ .../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 0 -> 6829 bytes .../logging/log4j/core/net/ssl/truststore.jks | Bin 0 -> 1487 bytes 33 files changed, 2668 insertions(+) create mode 100644 log4j-server/pom.xml copy spotless-license-header.txt
(logging-log4j-samples) 35/35: Upgrade vulnerable dependencies
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 9b5372a6149bdabfd1c6326b988e605ad71a0efd Author: Piotr P. Karwasz AuthorDate: Tue Nov 14 12:16:28 2023 +0100 Upgrade vulnerable dependencies --- log4j-server/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml index 5a78828..c95fdb2 100644 --- a/log4j-server/pom.xml +++ b/log4j-server/pom.xml @@ -72,7 +72,7 @@ com.fasterxml.woodstox woodstox-core - 5.0.2 + 6.5.1 @@ -80,8 +80,7 @@ org.apache.logging.log4j - log4j-core - test-jar + log4j-core-test test
(logging-log4j-samples) 26/35: LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 2f3a5fa902a1221d3cad4b7bf43576c23a892054
Author: Mikael Ståldal
AuthorDate: Fri Dec 29 12:31:25 2017 +0100
LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge
---
.../logging/log4j/server/ObjectInputStreamLogEventBridge.java | 7 ++-
.../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 3 +++
.../main/java/org/apache/logging/log4j/server/UdpSocketServer.java | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index 428ab83..c5ab4eb 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@ -25,10 +25,15 @@ import java.util.List;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
import org.apache.logging.log4j.util.FilteredObjectInputStream;
+import org.apache.logging.log4j.core.layout.SerializedLayout;
/**
- * Reads and logs serialized {@link LogEvent} objects from an {@link
ObjectInputStream}.
+ * Reads and logs serialized {@link LogEvent} objects (created with {@link
SerializedLayout}) from an {@link ObjectInputStream}.
+ *
+ * @deprecated Java Serialization has inherent security weaknesses, see
https://www.owasp.org/index.php/Deserialization_of_untrusted_data .
+ * Therefore {@link SerializedLayout} is deprecated, and so is this class. We
recommend using {@link JsonInputStreamLogEventBridge} instead.
*/
+@Deprecated
public class ObjectInputStreamLogEventBridge extends
AbstractLogEventBridge {
private final List allowedClasses;
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 52eafcc..6d163fe 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -161,6 +161,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* @throws IOException
* if an I/O error occurs when opening the socket.
*/
+@Deprecated
public static TcpSocketServer
createSerializedSocketServer(final int port) throws IOException {
LOGGER.entry(port);
final TcpSocketServer socketServer = new
TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge());
@@ -181,6 +182,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* if an I/O error occurs when opening the socket.
* @since 2.7
*/
+@Deprecated
public static TcpSocketServer
createSerializedSocketServer(final int port, final int backlog,
final InetAddress localBindAddress) throws IOException {
return createSerializedSocketServer(port, backlog, localBindAddress,
Collections.emptyList());
@@ -201,6 +203,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* if an I/O error occurs when opening the socket.
* @since 2.8.2
*/
+@Deprecated
public static TcpSocketServer
createSerializedSocketServer(
final int port, final int backlog, final InetAddress localBindAddress,
final List allowedClasses
) throws IOException {
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 8f53e03..17a7cdd 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -61,6 +61,7 @@ public class UdpSocketServer extends
AbstractSocketServer
* @throws IOException
* if an I/O error occurs when opening the socket.
*/
+@Deprecated
public static UdpSocketServer
createSerializedSocketServer(final int port) throws IOException {
return new UdpSocketServer<>(port, new
ObjectInputStreamLogEventBridge());
}
@@ -74,6 +75,7 @@ public class UdpSocketServer extends
AbstractSocketServer
* @throws IOException if an I/O error occurs when opening the socket.
* @since 2.8.2
*/
+@Deprecated
public static UdpSocketServer
createSerializedSocketServer(final int port,
final List allowedClasses)
throws IOException {
(logging-log4j-samples) 31/35: [LOG4J2-2493] Remove deprecated code. Still a bit more to do.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit fbbe52bc09a6129944a5cad686f458d90726557b
Author: Gary Gregory
AuthorDate: Mon Oct 29 17:41:37 2018 -0600
[LOG4J2-2493] Remove deprecated code. Still a bit more to do.
---
.../log4j/server/AbstractSocketServerTest.java | 5 --
.../server/TcpSerializedSocketServerTest.java | 63 --
.../server/UdpSerializedSocketServerTest.java | 58
3 files changed, 126 deletions(-)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 2e2c0d0..758716b 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -37,7 +37,6 @@ import
org.apache.logging.log4j.core.appender.AppenderLoggingException;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.SocketAppender;
import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.apache.logging.log4j.core.layout.SerializedLayout;
import org.apache.logging.log4j.core.net.Protocol;
import org.apache.logging.log4j.jackson.json.layout.JsonLayout;
import org.apache.logging.log4j.jackson.xml.layout.XmlLayout;
@@ -98,10 +97,6 @@ public abstract class AbstractSocketServerTest {
protected abstract Layout createLayout();
-protected Layout createSerializedLayout() {
-return SerializedLayout.createLayout();
-}
-
protected Layout createXmlLayout() {
return XmlLayout.newBuilder()
.setLocationInfo(true)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
deleted file mode 100644
index 7b0a3c1..000
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
+++ /dev/null
@@ -1,63 +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.server;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.net.Protocol;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-public class TcpSerializedSocketServerTest extends AbstractSocketServerTest {
-
-private static TcpSocketServer server;
-
-@BeforeClass
-public static void setupClass() throws Exception {
-LoggerContext.getContext(false).reconfigure();
-server = TcpSocketServer.createSerializedSocketServer(PORT_NUM);
-thread = server.startNewThread();
-}
-
-@AfterClass
-public static void tearDownClass() {
-try {
-server.shutdown();
-} catch (final IOException e) {
-e.printStackTrace();
-}
-try {
-thread.join();
-} catch (final InterruptedException e) {
-// ignore
-}
-}
-
-public TcpSerializedSocketServerTest() {
-super(Protocol.TCP, PORT, false);
-}
-
-@Override
-protected Layout createLayout() {
-return super.createSerializedLayout();
-}
-
-}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java
deleted file mode 100644
index be826c9..000
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java
+++ /dev/null
@@ -1,58 +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
(logging-log4j-samples) 29/35: Updates for 3.0.0 modules.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 65b62e20430a22248df1892c138a5b9da2d9f614
Author: Gary Gregory
AuthorDate: Mon Jun 4 18:33:43 2018 -0600
Updates for 3.0.0 modules.
---
log4j-server/pom.xml| 17 ++---
.../java/org/apache/logging/log4j/server/JmsServer.java | 4 ++--
.../log4j/server/JsonInputStreamLogEventBridge.java | 2 +-
.../log4j/server/XmlInputStreamLogEventBridge.java | 2 +-
.../logging/log4j/server/AbstractSocketServerTest.java | 10 ++
5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 10868b9..5a78828 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
org.apache.logging.log4j
log4j-tools
-2.11.1-SNAPSHOT
+3.0.0-SNAPSHOT
../
log4j-server
@@ -34,11 +34,22 @@
org.apache.logging.log4j
- log4j-api
+ log4j-core
org.apache.logging.log4j
- log4j-core
+ log4j-jms
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-json
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-xml
+ ${project.version}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index a6cf9cc..e46632c 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -36,9 +36,9 @@ import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LifeCycle2;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
-import org.apache.logging.log4j.core.appender.mom.JmsAppender;
-import org.apache.logging.log4j.core.appender.mom.JmsManager;
import org.apache.logging.log4j.core.net.JndiManager;
+import org.apache.logging.log4j.jms.appender.JmsAppender;
+import org.apache.logging.log4j.jms.appender.JmsManager;
/**
* LogEventListener server that receives LogEvents over a JMS {@link
javax.jms.Destination}.
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
index ae1b0df..8444c74 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.parser.JsonLogEventParser;
+import org.apache.logging.log4j.jackson.json.parser.JsonLogEventParser;
import org.apache.logging.log4j.util.Chars;
/**
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
index b042bf9..3c4a1e0 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.parser.XmlLogEventParser;
+import org.apache.logging.log4j.jackson.xml.parser.XmlLogEventParser;
/**
* Reads and logs {@link LogEvent}s from an {@link InputStream}.
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 404bbf6..0b5fd2d 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.logging.log4j.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
@@ -32,19 +36,17 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.SocketAppender;
-import
(logging-log4j-samples) 12/35: create test-jar, which is used by the log4j-core-its module
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit e04dd4681c04e7c2c2deee3373807ce5f40f3e84 Author: Pascal Schumacher AuthorDate: Mon Jul 31 20:20:07 2017 +0200 create test-jar, which is used by the log4j-core-its module --- log4j-server/pom.xml | 11 +++ 1 file changed, 11 insertions(+) diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml index 36098e0..9674ab8 100644 --- a/log4j-server/pom.xml +++ b/log4j-server/pom.xml @@ -125,6 +125,17 @@ + +org.apache.maven.plugins +maven-jar-plugin + + + + test-jar + + + +
(logging-log4j-samples) 32/35: [LOG4J2-2493] Remove deprecated code. Still a bit more to do.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 0824a07d7971a8474e8b2422510a4db2aefa7786
Author: Gary Gregory
AuthorDate: Mon Oct 29 17:45:20 2018 -0600
[LOG4J2-2493] Remove deprecated code. Still a bit more to do.
---
.../logging/log4j/server/TcpSocketServer.java | 61 --
.../logging/log4j/server/UdpSocketServer.java | 30 ---
2 files changed, 91 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 71e89e1..c3f5ae7 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -152,67 +152,6 @@ public class TcpSocketServer
extends AbstractSocketServer
return LOGGER.exit(socketServer);
}
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *The port number, or 0 to automatically allocate a port number.
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- */
-@Deprecated
-public static TcpSocketServer
createSerializedSocketServer(final int port) throws IOException {
-LOGGER.entry(port);
-final TcpSocketServer socketServer = new
TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge());
-return LOGGER.exit(socketServer);
-}
-
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *The port number, or 0 to automatically allocate a port number.
- * @param backlog
- *The server socket backlog.
- * @param localBindAddress
- *The local InetAddress the server will bind to
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- * @since 2.7
- */
-@Deprecated
-public static TcpSocketServer
createSerializedSocketServer(final int port, final int backlog,
-final InetAddress localBindAddress) throws IOException {
-return createSerializedSocketServer(port, backlog, localBindAddress,
Collections.emptyList());
-}
-
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *The port number, or 0 to automatically allocate a port number.
- * @param backlog
- *The server socket backlog.
- * @param localBindAddress
- *The local InetAddress the server will bind to
- * @param allowedClasses additional class names to allow for
deserialization
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- * @since 2.8.2
- */
-@Deprecated
-public static TcpSocketServer
createSerializedSocketServer(
-final int port, final int backlog, final InetAddress localBindAddress,
final List allowedClasses
-) throws IOException {
-LOGGER.entry(port);
-final TcpSocketServer socketServer = new
TcpSocketServer<>(port, backlog, localBindAddress,
-new ObjectInputStreamLogEventBridge(allowedClasses));
-return LOGGER.exit(socketServer);
-}
-
/**
* Creates a socket server that reads XML log events.
*
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 17a7cdd..6148ad8 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -52,36 +52,6 @@ public class UdpSocketServer extends
AbstractSocketServer
return new UdpSocketServer<>(port, new
JsonInputStreamLogEventBridge());
}
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *the port to listen
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- */
-@Deprecated
-public static UdpSocketServer
createSerializedSocketServer(final int port) throws IOException {
-return new UdpSocketServer<>(port, new
ObjectInputStreamLogEventBridge());
-}
-
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port the port to listen
- * @param allowedClasses additional classes to allow for deserialization
- * @return a new a socket server
- * @throws IOException if an I/O error occurs when opening the
(logging-log4j-samples) 03/35: LOG4J2-1958 Read JSON log event by default in TCP and UDP servers
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 65fb4b0e3e2380ca3dfb5c873a19bca5fd251f39
Author: Mikael Ståldal
AuthorDate: Wed Jun 28 18:42:12 2017 +0200
LOG4J2-1958 Read JSON log event by default in TCP and UDP servers
---
.../logging/log4j/server/TcpSocketServer.java | 76 ++
.../logging/log4j/server/UdpSocketServer.java | 4 +-
2 files changed, 67 insertions(+), 13 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 9a5521c..fb9d53b 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -112,7 +112,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* Creates a socket server that reads JSON log events.
*
* @param port
- *the port to listen
+ *The server socket port.
* @return a new a socket server
* @throws IOException
* if an I/O error occurs when opening the socket.
@@ -123,11 +123,33 @@ public class TcpSocketServer
extends AbstractSocketServer
return LOGGER.exit(socketServer);
}
+/**
+ * Creates a socket server that reads JSON log events.
+ *
+ * @param port
+ *The server socket port.
+ * @param backlog
+ *The server socket backlog.
+ * @param localBindAddress
+ *The local InetAddress the server will bind to
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ * @since 2.9
+ */
+public static TcpSocketServer createJsonSocketServer(final
int port, final int backlog,
+final InetAddress localBindAddress) throws IOException {
+LOGGER.entry("createJsonSocketServer", port, backlog,
localBindAddress);
+final TcpSocketServer socketServer = new
TcpSocketServer<>(port, backlog, localBindAddress,
+new JsonInputStreamLogEventBridge());
+return LOGGER.exit(socketServer);
+}
+
/**
* Creates a socket server that reads serialized log events.
*
* @param port
- *the port to listen
+ *The server socket port.
* @return a new a socket server
* @throws IOException
* if an I/O error occurs when opening the socket.
@@ -141,8 +163,12 @@ public class TcpSocketServer
extends AbstractSocketServer
/**
* Creates a socket server that reads serialized log events.
*
- * @param port the port to listen
- * @param localBindAddress The server socket's local bin address
+ * @param port
+ *The server socket port.
+ * @param backlog
+ *The server socket backlog.
+ * @param localBindAddress
+ *The local InetAddress the server will bind to
* @return a new a socket server
* @throws IOException
* if an I/O error occurs when opening the socket.
@@ -156,8 +182,12 @@ public class TcpSocketServer
extends AbstractSocketServer
/**
* Creates a socket server that reads serialized log events.
*
- * @param port the port to listen
- * @param localBindAddress The server socket's local bin address
+ * @param port
+ *The server socket port.
+ * @param backlog
+ *The server socket backlog.
+ * @param localBindAddress
+ *The local InetAddress the server will bind to
* @param allowedClasses additional class names to allow for
deserialization
* @return a new a socket server
* @throws IOException
@@ -177,7 +207,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* Creates a socket server that reads XML log events.
*
* @param port
- *the port to listen
+ *The server socket port.
* @return a new a socket server
* @throws IOException
* if an I/O error occurs when opening the socket.
@@ -188,6 +218,29 @@ public class TcpSocketServer
extends AbstractSocketServer
return LOGGER.exit(socketServer);
}
+/**
+ * Creates a socket server that reads XML log events.
+ *
+ * @param port
+ *The server socket port.
+ * @param backlog
+ *The server socket backlog.
+ * @param localBindAddress
+ *The local InetAddress the server will bind to
+ * @return a new a socket server
+ * @throws IOException
+ * if an I/O error occurs when opening the socket.
+ * @since 2.9
+ */
+public static TcpSocketServer createXmlSocketServer(final int
port,
+final int backlog, final
(logging-log4j-samples) 25/35: LOG4J2-2163 Use FilteredObjectInputStream from log4j-api
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 5df0bc23d0614266213c1b08a5fd424d996eb64a
Author: Mikael Ståldal
AuthorDate: Fri Dec 29 12:19:53 2017 +0100
LOG4J2-2163 Use FilteredObjectInputStream from log4j-api
---
.../log4j/server/FilteredObjectInputStream.java| 67 --
.../server/ObjectInputStreamLogEventBridge.java| 1 +
2 files changed, 1 insertion(+), 67 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
deleted file mode 100644
index c5bf92f..000
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
+++ /dev/null
@@ -1,67 +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.server;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Extended ObjectInputStream that only allows certain classes to be
deserialized.
- *
- * @since 2.8.2
- */
-public class FilteredObjectInputStream extends ObjectInputStream {
-
-private static final List REQUIRED_JAVA_CLASSES = Arrays.asList(
-// for StandardLevel
-"java.lang.Enum",
-// for location information
-"java.lang.StackTraceElement",
-// for Message delegate
-"java.rmi.MarshalledObject",
-"[B"
-);
-
-private final Collection allowedClasses;
-
-public FilteredObjectInputStream(final InputStream in, final
Collection allowedClasses) throws IOException {
-super(in);
-this.allowedClasses = allowedClasses;
-}
-
-@Override
-protected Class resolveClass(final ObjectStreamClass desc) throws
IOException, ClassNotFoundException {
-String name = desc.getName();
-if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) {
-throw new InvalidObjectException("Class is not allowed for
deserialization: " + name);
-}
-return super.resolveClass(desc);
-}
-
-private static boolean isAllowedByDefault(final String name) {
-return name.startsWith("org.apache.logging.log4j.") ||
-name.startsWith("[Lorg.apache.logging.log4j.") ||
-REQUIRED_JAVA_CLASSES.contains(name);
-}
-
-}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index 0f4a06f..428ab83 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
+import org.apache.logging.log4j.util.FilteredObjectInputStream;
/**
* Reads and logs serialized {@link LogEvent} objects from an {@link
ObjectInputStream}.
(logging-log4j-samples) 30/35: [LOG4J2-2493] Remove deprecated code. Still a bit more to do.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 9d9512b29e398ff69228d968de904da2d5dd43ab
Author: Gary Gregory
AuthorDate: Mon Oct 29 17:36:03 2018 -0600
[LOG4J2-2493] Remove deprecated code. Still a bit more to do.
---
.../log4j/server/AbstractSocketServerTest.java | 21 ++---
.../log4j/server/SslXmlSocketServerTest.java| 21 ++---
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 0b5fd2d..2e2c0d0 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -190,7 +190,7 @@ public abstract class AbstractSocketServerTest {
socketAppender.start();
final ListAppender listAppender = new ListAppender("Events",
serverFilter, null, false, false);
listAppender.start();
-final PatternLayout layout =
PatternLayout.newBuilder().withPattern("%m %ex%n").build();
+final PatternLayout layout = PatternLayout.newBuilder().setPattern("%m
%ex%n").build();
final ConsoleAppender console =
ConsoleAppender.createDefaultAppenderForLayout(layout);
final Logger serverLogger = ctx.getLogger(this.getClass().getName());
serverLogger.addAppender(console);
@@ -229,16 +229,15 @@ public abstract class AbstractSocketServerTest {
final Layout socketLayout) {
// @formatter:off
return SocketAppender.newBuilder()
-.withProtocol(this.protocol)
-.withHost("localhost")
-.withPort(this.port)
-.withReconnectDelayMillis(-1)
-.withName("test")
-.withImmediateFlush(true)
-.withImmediateFail(false)
-.withIgnoreExceptions(false)
-.withLayout(socketLayout)
-.withFilter(socketFilter)
+.setProtocol(this.protocol)
+.setHost("localhost")
+.setPort(this.port)
+.setReconnectDelayMillis(-1)
+.setName("test")
+.setImmediateFlush(true)
+.setImmediateFail(false)
+.setIgnoreExceptions(false)
+.setLayout(socketLayout).setFilter(socketFilter)
.build();
// @formatter:on
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
index 42a9e9e..6d08723 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
@@ -53,17 +53,16 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
final Layout socketLayout) {
// @formatter:off
return SocketAppender.newBuilder()
-.withProtocol(this.protocol)
-.withHost("localhost")
-.withPort(this.port)
-.withReconnectDelayMillis(-1)
-.withName("test")
-.withImmediateFlush(true)
-.withImmediateFail(false)
-.withIgnoreExceptions(false)
-.withLayout(socketLayout)
-.withFilter(socketFilter)
-.withSslConfiguration(sslConfiguration)
+.setProtocol(this.protocol)
+.setHost("localhost")
+.setPort(this.port)
+.setReconnectDelayMillis(-1)
+.setName("test")
+.setImmediateFlush(true)
+.setImmediateFail(false)
+.setIgnoreExceptions(false)
+.setLayout(socketLayout).setFilter(socketFilter)
+.setSslConfiguration(sslConfiguration)
.build();
// @formatter:on
}
(logging-log4j-samples) 34/35: Restore files
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 5c0e12f56389da9a868206a0c5dcd325ef48cfe5
Author: Ralph Goers
AuthorDate: Mon Nov 28 22:44:16 2022 -0700
Restore files
---
log4j-server/pom.xml | 242 +++
.../log4j/server/AbstractLogEventBridge.java | 44 +++
.../logging/log4j/server/AbstractSocketServer.java | 217 +
.../log4j/server/InputStreamLogEventBridge.java| 108 +++
.../org/apache/logging/log4j/server/JmsServer.java | 149 +
.../server/JsonInputStreamLogEventBridge.java | 89 ++
.../logging/log4j/server/LogEventBridge.java | 56
.../server/ObjectInputStreamLogEventBridge.java| 69 +
.../log4j/server/SecureTcpSocketServer.java| 41 +++
.../logging/log4j/server/TcpSocketServer.java | 341 +
.../logging/log4j/server/UdpSocketServer.java | 167 ++
.../log4j/server/XmlInputStreamLogEventBridge.java | 54
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 69 +
.../log4j/server/mom/jms/JmsQueueReceiver.java | 46 +++
.../log4j/server/mom/jms/JmsTopicReceiver.java | 46 +++
.../logging/log4j/server/mom/jms/package-info.java | 26 ++
.../apache/logging/log4j/server/package-info.java | 24 ++
log4j-server/src/site/markdown/index.md| 30 ++
log4j-server/src/site/site.xml | 52
.../log4j/server/AbstractSocketServerTest.java | 240 +++
.../log4j/server/SslXmlSocketServerTest.java | 103 +++
.../log4j/server/TcpJsonSocketServerTest.java | 62
.../log4j/server/TcpXmlSocketServerTest.java | 65
.../logging/log4j/server/ThreadIdFilter.java | 40 +++
.../logging/log4j/server/ThreadNameFilter.java | 39 +++
.../logging/log4j/server/ThreadPriorityFilter.java | 40 +++
.../log4j/server/UdpJsonSocketServerTest.java | 58
.../log4j/server/UdpXmlSocketServerTest.java | 61
.../mom/activemq/ActiveMqBrokerServiceHelper.java | 51 +++
.../mom/activemq/ActiveMqBrokerServiceRule.java| 94 ++
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 42 +++
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 0 -> 6829 bytes
.../logging/log4j/core/net/ssl/truststore.jks | Bin 0 -> 1487 bytes
33 files changed, 2765 insertions(+)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
new file mode 100644
index 000..5a78828
--- /dev/null
+++ b/log4j-server/pom.xml
@@ -0,0 +1,242 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+org.apache.logging.log4j
+log4j-tools
+3.0.0-SNAPSHOT
+../
+
+ log4j-server
+ jar
+ Apache Log4j Server components
+ The Apache Log4j server components
+
+${basedir}/..
+/log4j-server
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.apache.logging.log4j
+ log4j-jms
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-json
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-xml
+ ${project.version}
+
+
+
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
+ provided
+ true
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+ 5.0.2
+
+
+
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+ test-jar
+ test
+
+
+ junit
+ junit
+ test
+
+
+ org.hamcrest
+ hamcrest-all
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.apache.activemq
+ activemq-broker
+ test
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-remote-resources-plugin
+
+
+
+ process
+
+
+ false
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
org.apache.logging.log4j.core.net.*
+
+
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-changes-plugin
+${changes.plugin.version}
+
+
+
+ changes-report
+
+
+
(logging-log4j-samples) 11/35: Update JMS Server to match updated Appender. Move some classes ActiveMQ JUnit test rule in this module from the Core module. This is to avoid a dependency cycle.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 23c3345f9b2147f938567475d29a9abab4180eb0
Author: Gary Gregory
AuthorDate: Sun Jul 30 13:52:12 2017 -0700
Update JMS Server to match updated Appender. Move some classes ActiveMQ
JUnit test rule in this module from the Core module. This is to avoid a
dependency cycle.
---
log4j-server/pom.xml | 5 ++
.../org/apache/logging/log4j/server/JmsServer.java | 22 ++---
.../logging/log4j/server/UdpSocketServer.java | 2 +-
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 33 ++--
.../log4j/server/mom/jms/JmsQueueReceiver.java | 8 +-
.../log4j/server/mom/jms/JmsTopicReceiver.java | 6 +-
.../mom/activemq/ActiveMqBrokerServiceHelper.java | 51
.../mom/activemq/ActiveMqBrokerServiceRule.java| 94 ++
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 42 ++
9 files changed, 238 insertions(+), 25 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 29de565..36098e0 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -93,6 +93,11 @@
mockito-core
test
+
+ org.apache.activemq
+ activemq-broker
+ test
+
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index 70477db..a6cf9cc 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -35,6 +36,7 @@ import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LifeCycle2;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
+import org.apache.logging.log4j.core.appender.mom.JmsAppender;
import org.apache.logging.log4j.core.appender.mom.JmsManager;
import org.apache.logging.log4j.core.net.JndiManager;
@@ -49,14 +51,14 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
private final JmsManager jmsManager;
private MessageConsumer messageConsumer;
-public JmsServer(final String connectionFactoryBindingName,
- final String destinationBindingName,
- final String username,
- final String password) {
+public JmsServer(final String connectionFactoryBindingName, final String
connectionFactoryName,
+final String providerURL, final String destinationBindingName,
final String username, final char[] password,
+final Properties jndiProperties) {
final String managerName = JmsServer.class.getName() + '@' +
JmsServer.class.hashCode();
-// TODO init JmsManager properly
-jmsManager = JmsManager.getJmsManager(managerName, jndiManager,
connectionFactoryBindingName,
-destinationBindingName, username, password.toCharArray(), false,
0L);
+final Properties jndiManager =
JndiManager.createProperties(connectionFactoryBindingName, providerURL, null,
+null, null, jndiProperties);
+jmsManager = JmsManager.getJmsManager(managerName, jndiManager,
connectionFactoryName, destinationBindingName,
+username, password, false,
JmsAppender.Builder.DEFAULT_RECONNECT_INTERVAL_MILLIS);
}
@Override
@@ -76,7 +78,7 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
}
} else {
LOGGER.warn("Received message of type {} and JMSType {} which
cannot be handled.", message.getClass(),
-message.getJMSType());
+message.getJMSType());
}
} catch (final JMSException e) {
LOGGER.catching(e);
@@ -130,10 +132,8 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
* Starts and runs this server until the user types "exit" into standard
input.
*
* @throws IOException
- * @since 2.6
*/
-public void run() throws IOException {
-this.start();
+public void commandLineLoop() throws IOException {
System.out.println("Type \"exit\" to quit.");
final BufferedReader stdin = new BufferedReader(new
InputStreamReader(System.in, Charset.defaultCharset()));
while (true) {
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
(logging-log4j-samples) 33/35: Move Log4j Server to its own repo
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 66c8fe77fc94899915ac443cc72c1d8e25891257
Author: Ralph Goers
AuthorDate: Mon Nov 28 22:39:59 2022 -0700
Move Log4j Server to its own repo
---
log4j-server/pom.xml | 242 ---
.../log4j/server/AbstractLogEventBridge.java | 44 ---
.../logging/log4j/server/AbstractSocketServer.java | 217 -
.../log4j/server/InputStreamLogEventBridge.java| 108 ---
.../org/apache/logging/log4j/server/JmsServer.java | 149 -
.../server/JsonInputStreamLogEventBridge.java | 89 --
.../logging/log4j/server/LogEventBridge.java | 56
.../server/ObjectInputStreamLogEventBridge.java| 69 -
.../log4j/server/SecureTcpSocketServer.java| 41 ---
.../logging/log4j/server/TcpSocketServer.java | 341 -
.../logging/log4j/server/UdpSocketServer.java | 167 --
.../log4j/server/XmlInputStreamLogEventBridge.java | 54
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 69 -
.../log4j/server/mom/jms/JmsQueueReceiver.java | 46 ---
.../log4j/server/mom/jms/JmsTopicReceiver.java | 46 ---
.../logging/log4j/server/mom/jms/package-info.java | 26 --
.../apache/logging/log4j/server/package-info.java | 24 --
log4j-server/src/site/markdown/index.md| 30 --
log4j-server/src/site/site.xml | 52
.../log4j/server/AbstractSocketServerTest.java | 240 ---
.../log4j/server/SslXmlSocketServerTest.java | 103 ---
.../log4j/server/TcpJsonSocketServerTest.java | 62
.../log4j/server/TcpXmlSocketServerTest.java | 65
.../logging/log4j/server/ThreadIdFilter.java | 40 ---
.../logging/log4j/server/ThreadNameFilter.java | 39 ---
.../logging/log4j/server/ThreadPriorityFilter.java | 40 ---
.../log4j/server/UdpJsonSocketServerTest.java | 58
.../log4j/server/UdpXmlSocketServerTest.java | 61
.../mom/activemq/ActiveMqBrokerServiceHelper.java | 51 ---
.../mom/activemq/ActiveMqBrokerServiceRule.java| 94 --
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 42 ---
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 6829 -> 0 bytes
.../logging/log4j/core/net/ssl/truststore.jks | Bin 1487 -> 0 bytes
33 files changed, 2765 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
deleted file mode 100644
index 5a78828..000
--- a/log4j-server/pom.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
- 4.0.0
-
-org.apache.logging.log4j
-log4j-tools
-3.0.0-SNAPSHOT
-../
-
- log4j-server
- jar
- Apache Log4j Server components
- The Apache Log4j server components
-
-${basedir}/..
-/log4j-server
-
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-jms
- ${project.version}
-
-
- org.apache.logging.log4j
- log4j-layout-jackson-json
- ${project.version}
-
-
- org.apache.logging.log4j
- log4j-layout-jackson-xml
- ${project.version}
-
-
-
- org.jboss.spec.javax.jms
- jboss-jms-api_1.1_spec
- provided
- true
-
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-xml
-
-
-
- com.fasterxml.woodstox
- woodstox-core
- 5.0.2
-
-
-
-
-
-
- org.apache.logging.log4j
- log4j-core
- test-jar
- test
-
-
- junit
- junit
- test
-
-
- org.hamcrest
- hamcrest-all
- test
-
-
- org.mockito
- mockito-core
- test
-
-
- org.apache.activemq
- activemq-broker
- test
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-remote-resources-plugin
-
-
-
- process
-
-
- false
-
-
-
-
-
-org.apache.felix
-maven-bundle-plugin
-
-
-
org.apache.logging.log4j.core.net.*
-
-
-
-
-org.apache.maven.plugins
-maven-jar-plugin
-
-
-
- test-jar
-
-
-
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-changes-plugin
-${changes.plugin.version}
-
-
-
- changes-report
-
(logging-log4j-samples) 24/35: Upgrade to latest Log4j
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 3aa488f6daba4ffed542b6c1d12d2186e6c8d12a
Author: Mikael Ståldal
AuthorDate: Mon Dec 11 20:41:49 2017 +0100
Upgrade to latest Log4j
---
log4j-server/pom.xml | 2 +-
.../java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index d5493c3..6ef00c5 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
org.apache.logging.log4j
log4j-tools
-2.9-SNAPSHOT
+2.10.1-SNAPSHOT
../
log4j-server
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
index 1a4acb4..42a9e9e 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
@@ -42,9 +42,9 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
private static void initServerSocketFactory() throws
StoreConfigurationException {
final KeyStoreConfiguration ksc = new
KeyStoreConfiguration(TestConstants.KEYSTORE_FILE,
-TestConstants.KEYSTORE_PWD, TestConstants.KEYSTORE_TYPE, null);
+TestConstants.KEYSTORE_PWD(), TestConstants.KEYSTORE_TYPE,
null);
final TrustStoreConfiguration tsc = new
TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE,
-TestConstants.TRUSTSTORE_PWD, null, null);
+TestConstants.TRUSTSTORE_PWD(), null, null);
sslConfiguration = SslConfiguration.createSSLConfiguration(null, ksc,
tsc);
}
(logging-log4j-samples) 21/35: Add toString().
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit c60690d22bd8338511526d526d07fca421527e74
Author: Gary Gregory
AuthorDate: Thu Aug 17 14:04:26 2017 -0600
Add toString().
---
.../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 6 ++
.../main/java/org/apache/logging/log4j/server/UdpSocketServer.java | 6 ++
2 files changed, 12 insertions(+)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index d8dda84..bd8604c 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -391,4 +391,10 @@ public class TcpSocketServer
extends AbstractSocketServer
serverSocket.close();
logger.traceExit(entry);
}
+
+@Override
+public String toString() {
+return "TcpSocketServer [serverSocket=" + serverSocket + ", handlers="
+ handlers + ", logEventInput="
++ logEventInput + "]";
+}
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 4229003..8f53e03 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -186,4 +186,10 @@ public class UdpSocketServer
extends AbstractSocketServer
//Thread.currentThread().interrupt();
datagramSocket.close();
}
+
+@Override
+public String toString() {
+return "UdpSocketServer [datagramSocket=" + datagramSocket + ",
maxBufferSize=" + maxBufferSize
++ ", logEventInput=" + logEventInput + "]";
+}
}
(logging-log4j-samples) 23/35: Formatting.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 74c968cdf3cedb8bcc8bf4a908bb58fa480b0147
Author: Gary Gregory
AuthorDate: Thu Aug 17 14:52:29 2017 -0600
Formatting.
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index bd8604c..52eafcc 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -51,8 +51,7 @@ public class TcpSocketServer extends
AbstractSocketServer
@Command(name = "TcpSocketServer")
protected static class CommandLineArguments extends
AbstractSocketServer.CommandLineArguments {
-@Option(names = { "--backlog",
-"-b" }, description = "Server socket backlog. Must be a
positive integer.")
+@Option(names = { "--backlog", "-b" }, description = "Server socket
backlog. Must be a positive integer.")
// Same default as ServerSocket
private int backlog = 50;
(logging-log4j-samples) 10/35: Intentionally break compilation to indicate this needs to be fixed
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit c0f8286fa6fe4d23eca5b062487deca8244c6e87
Author: Mikael Ståldal
AuthorDate: Sun Jul 30 10:53:25 2017 +0200
Intentionally break compilation to indicate this needs to be fixed
---
.../src/main/java/org/apache/logging/log4j/server/JmsServer.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index 8bc549c..70477db 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -54,7 +54,7 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
final String username,
final String password) {
final String managerName = JmsServer.class.getName() + '@' +
JmsServer.class.hashCode();
-final Properties jndiManager = JndiManager.createProperties("", "",
"", "", "", new Properties());
+// TODO init JmsManager properly
jmsManager = JmsManager.getJmsManager(managerName, jndiManager,
connectionFactoryBindingName,
destinationBindingName, username, password.toCharArray(), false,
0L);
}
(logging-log4j-samples) 08/35: [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 50273e7ec855987042fc066aee70b51fd05a9838
Author: Gary Gregory
AuthorDate: Fri Jul 28 16:11:00 2017 -0700
[LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment.
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index af458f8..7fde56b 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -346,6 +346,7 @@ public class TcpSocketServer extends
AbstractSocketServer
try {
// Accept incoming connections.
logger.debug("Listening for a connection {}...", serverSocket);
+@SuppressWarnings("resource") // clientSocket is closed during
SocketHandler shutdown
final Socket clientSocket = serverSocket.accept();
logger.debug("Acepted connection on {}...", serverSocket);
logger.debug("Socket accepted: {}", clientSocket);
(logging-log4j-samples) 20/35: Add util methods for tests.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 770e4d0899b95c6b9a4f44f07f030ccb350c2e1b
Author: Gary Gregory
AuthorDate: Tue Aug 15 17:08:12 2017 -0600
Add util methods for tests.
---
.../java/org/apache/logging/log4j/server/SecureTcpSocketServer.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
index 81c9d64..39f2afc 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
@@ -23,12 +23,16 @@ import
org.apache.logging.log4j.core.net.ssl.SslConfiguration;
/**
* Listens for events over a secure socket connection (SSL/TLS).
- *
+ *
* @param
*The kind of input stream read
*/
public class SecureTcpSocketServer extends
TcpSocketServer {
+public static SecureTcpSocketServer createJsonServer(final
int port, final SslConfiguration sslConfiguration) throws IOException {
+return new SecureTcpSocketServer<>(port, new
JsonInputStreamLogEventBridge(), sslConfiguration);
+}
+
public SecureTcpSocketServer(final int port, final LogEventBridge
logEventInput,
final SslConfiguration sslConfig) throws IOException {
super(port, logEventInput,
sslConfig.getSslServerSocketFactory().createServerSocket(port));
(logging-log4j-samples) 22/35: Add toString().
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit a2d1da6cf6e41aa0b0537ecdd86efe5033e9efa3 Author: Gary Gregory AuthorDate: Thu Aug 17 14:11:55 2017 -0600 Add toString(). --- .../org/apache/logging/log4j/server/InputStreamLogEventBridge.java | 6 ++ 1 file changed, 6 insertions(+) diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java index 90597c9..6d66303 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java @@ -99,4 +99,10 @@ public abstract class InputStreamLogEventBridge extends AbstractLogEventBridge
(logging-log4j-samples) 13/35: Closes 1
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 17c384b13332fcfda06213ecd2ecf154174443b9 Author: Mikael Ståldal AuthorDate: Tue Aug 1 21:12:08 2017 +0200 Closes 1
(logging-log4j-samples) 19/35: LOG4J2-2011 moved classes from util.picocli to tools.picocli
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 4e8bde3fb88afd3f6eb14016bf06c8f297f8cd71 Author: rpopma AuthorDate: Wed Aug 16 07:24:48 2017 +0900 LOG4J2-2011 moved classes from util.picocli to tools.picocli --- .../java/org/apache/logging/log4j/server/AbstractSocketServer.java | 4 ++-- .../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 6 +++--- .../main/java/org/apache/logging/log4j/server/UdpSocketServer.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java index 4f487f5..2024b6b 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java @@ -38,9 +38,9 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationSource; import org.apache.logging.log4j.core.config.xml.XmlConfiguration; import org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory; -import org.apache.logging.log4j.core.util.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; import org.apache.logging.log4j.util.Strings; /** diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java index 9c3af03..d8dda84 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java @@ -34,9 +34,9 @@ import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Command; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Command; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.message.EntryMessage; /** diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java index 533c4b2..4229003 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java @@ -28,7 +28,7 @@ import java.util.List; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; -import org.apache.logging.log4j.core.util.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; /** * Listens for Log4j events on a datagram socket and passes them on to Log4j.
(logging-log4j-samples) 18/35: LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit ecc4cefaad174e34a3c143f51db074eeb2ab893f
Author: rpopma
AuthorDate: Tue Aug 15 01:24:56 2017 +0900
LOG4J2-2011 replace JCommander command line parser with picocli to let
users run Log4j2 utility applications without requiring an external dependency
---
log4j-server/pom.xml | 5 ---
.../logging/log4j/server/AbstractSocketServer.java | 17 +++-
.../logging/log4j/server/TcpSocketServer.java | 45 +++---
.../logging/log4j/server/UdpSocketServer.java | 21 +-
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 4 +-
5 files changed, 42 insertions(+), 50 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 9674ab8..d5493c3 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -40,11 +40,6 @@
org.apache.logging.log4j
log4j-core
-
-
- com.beust
- jcommander
-
org.jboss.spec.javax.jms
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
index e2dff83..4f487f5 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
@@ -30,8 +30,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEventListener;
@@ -41,8 +39,8 @@ import
org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.config.xml.XmlConfiguration;
import org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory;
import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
-import org.apache.logging.log4j.core.util.InetAddressConverter;
import org.apache.logging.log4j.core.util.Log4jThread;
+import org.apache.logging.log4j.core.util.picocli.CommandLine.Option;
import org.apache.logging.log4j.util.Strings;
/**
@@ -57,22 +55,19 @@ public abstract class AbstractSocketServer extends LogEve
protected static class CommandLineArguments extends
BasicCommandLineArguments {
-@Parameter(names = { "--config", "-c" }, description = "Log4j
configuration file location (path or URL).")
+@Option(names = { "--config", "-c" }, description = "Log4j
configuration file location (path or URL).")
private String configLocation;
-@Parameter(names = { "--interactive",
-"-i" }, description = "Accepts commands on standard input
(\"exit\" is the only command).")
+@Option(names = { "--interactive", "-i" }, description = "Accepts
commands on standard input (\"exit\" is the only command).")
private boolean interactive;
-@Parameter(names = { "--port",
-"-p" }, validateWith = PositiveInteger.class, description =
"The server port number, or 0 to automatically allocate a port number.")
+@Option(names = { "--port", "-p" }, description = "The server port
number, or 0 to automatically allocate a port number.")
private int port;
-@Parameter(names = { "--localbindaddress",
-"-a" }, converter = InetAddressConverter.class, description =
"Server socket local bind address.")
+@Option(names = { "--localbindaddress", "-a" }, description = "Server
socket local bind address.")
private InetAddress localBindAddress;
-@Parameter(names = {"--classes", "-C"}, description = "Additional
classes to allow deserialization")
+@Option(names = {"--classes", "-C"}, description = "Additional classes
to allow deserialization")
private List allowedClasses;
String getConfigLocation() {
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 8ab0089..9c3af03 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -30,28 +30,29 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.parser.ParseException;
-import
(logging-log4j-samples) 28/35: Fixes to match the main repo at 2.11.1-SNAPSHOT.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 672a1555c7f5670e7affcc7b9984a90b492eb322
Author: Gary Gregory
AuthorDate: Mon Jun 4 16:53:39 2018 -0600
Fixes to match the main repo at 2.11.1-SNAPSHOT.
---
log4j-server/pom.xml | 2 +-
.../org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 6ef00c5..10868b9 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
org.apache.logging.log4j
log4j-tools
-2.10.1-SNAPSHOT
+2.11.1-SNAPSHOT
../
log4j-server
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
index 891a4e0..ba6ea87 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.server.mom.jms;
import org.apache.logging.log4j.server.mom.activemq.ActiveMqBrokerServiceRule;
-import org.apache.logging.log4j.test.AvailablePortSystemPropertyRule;
+import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
import org.junit.ClassRule;
import org.junit.Test;
@@ -25,7 +25,7 @@ import org.junit.rules.RuleChain;
public class JmsQueueReceiverTest {
-private static final AvailablePortSystemPropertyRule portRule =
AvailablePortSystemPropertyRule
+private static final AvailablePortSystemPropertyTestRule portRule =
AvailablePortSystemPropertyTestRule
.create(ActiveMqBrokerServiceRule.PORT_PROPERTY_NAME);
private static final ActiveMqBrokerServiceRule activeMqBrokerServiceRule =
new ActiveMqBrokerServiceRule(
(logging-log4j-samples) 02/35: LOG4J2-1851 Move server components from core to new server module
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 42080af904cf8f56da5d4c4fc54da265290f801a
Author: Mikael Ståldal
AuthorDate: Fri Apr 21 15:24:47 2017 +0200
LOG4J2-1851 Move server components from core to new server module
---
.../log4j/server/FilteredObjectInputStream.java| 67 ++
.../server/ObjectInputStreamLogEventBridge.java| 1 -
2 files changed, 67 insertions(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
new file mode 100644
index 000..c5bf92f
--- /dev/null
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
@@ -0,0 +1,67 @@
+/*
+ * 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.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Extended ObjectInputStream that only allows certain classes to be
deserialized.
+ *
+ * @since 2.8.2
+ */
+public class FilteredObjectInputStream extends ObjectInputStream {
+
+private static final List REQUIRED_JAVA_CLASSES = Arrays.asList(
+// for StandardLevel
+"java.lang.Enum",
+// for location information
+"java.lang.StackTraceElement",
+// for Message delegate
+"java.rmi.MarshalledObject",
+"[B"
+);
+
+private final Collection allowedClasses;
+
+public FilteredObjectInputStream(final InputStream in, final
Collection allowedClasses) throws IOException {
+super(in);
+this.allowedClasses = allowedClasses;
+}
+
+@Override
+protected Class resolveClass(final ObjectStreamClass desc) throws
IOException, ClassNotFoundException {
+String name = desc.getName();
+if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) {
+throw new InvalidObjectException("Class is not allowed for
deserialization: " + name);
+}
+return super.resolveClass(desc);
+}
+
+private static boolean isAllowedByDefault(final String name) {
+return name.startsWith("org.apache.logging.log4j.") ||
+name.startsWith("[Lorg.apache.logging.log4j.") ||
+REQUIRED_JAVA_CLASSES.contains(name);
+}
+
+}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index ddd2e26..0f4a06f 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
-import org.apache.logging.log4j.core.util.FilteredObjectInputStream;
/**
* Reads and logs serialized {@link LogEvent} objects from an {@link
ObjectInputStream}.
(logging-log4j-samples) 15/35: Better Javadoc and minor clean up.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 354882752297013ca1e0926b4a8821321210747d
Author: ggregory
AuthorDate: Fri Aug 4 08:00:29 2017 -0700
Better Javadoc and minor clean up.
---
.../logging/log4j/server/TcpSocketServer.java | 789 ++---
1 file changed, 393 insertions(+), 396 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index ae1c592..51c071c 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -1,396 +1,393 @@
-/*
- * 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.server;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.parser.ParseException;
-import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
-import org.apache.logging.log4j.core.util.Closer;
-import org.apache.logging.log4j.core.util.Log4jThread;
-import org.apache.logging.log4j.message.EntryMessage;
-
-/**
- * Listens for Log4j events on a TCP server socket and passes them on to Log4j.
- *
- * @param
- *The kind of input stream read
- * @see #main(String[])
- */
-public class TcpSocketServer extends
AbstractSocketServer {
-
-protected static class CommandLineArguments extends
AbstractSocketServer.CommandLineArguments {
-
-@Parameter(names = { "--backlog",
-"-b" }, validateWith = PositiveInteger.class, description =
"Server socket backlog.")
-// Same default as ServerSocket
-private int backlog = 50;
-
-int getBacklog() {
-return backlog;
-}
-
-void setBacklog(final int backlog) {
-this.backlog = backlog;
-}
-
-}
-
-/**
- * Thread that processes the events.
- */
-private class SocketHandler extends Log4jThread {
-
-private final T inputStream;
-private final Socket socket;
-
-private volatile boolean shutdown = false;
-
-public SocketHandler(final Socket socket) throws IOException {
-this.socket = socket;
-this.inputStream =
logEventInput.wrapStream(socket.getInputStream());
-}
-
-@Override
-public void run() {
-final EntryMessage entry = logger.traceEntry();
-boolean closed = false;
-try {
-try {
-while (!shutdown) {
-logEventInput.logEvents(inputStream,
TcpSocketServer.this);
-}
-} catch (final EOFException e) {
-closed = true;
-} catch (final OptionalDataException e) {
-logger.error("OptionalDataException eof=" + e.eof + "
length=" + e.length, e);
-} catch (final IOException e) {
-logger.error("IOException encountered while reading from
socket", e);
-} catch (ParseException e) {
-logger.error("ParseException encountered while reading
from socket", e);
-}
-if (!closed) {
-Closer.closeSilently(inputStream);
-}
-} finally {
-handlers.remove(Long.valueOf(getId()));
-}
-logger.traceExit(entry);
-}
-
-public void
(logging-log4j-samples) 14/35: Closes #1
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 92a91f729d5b979a664046ee0ed6f6b533a869fd Author: Mikael Ståldal AuthorDate: Tue Aug 1 21:30:16 2017 +0200 Closes #1
(logging-log4j-samples) 09/35: [LOG4J2-1311] SocketAppender will lose several events after re-connection to server.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit a529f8c64f8a05521d8ce0877b76248e51caf34c
Author: Gary Gregory
AuthorDate: Sat Jul 29 00:54:16 2017 -0700
[LOG4J2-1311] SocketAppender will lose several events after
re-connection to server.
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 7fde56b..ae1c592 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -389,7 +389,7 @@ public class TcpSocketServer extends
AbstractSocketServer
public void shutdown() throws IOException {
final EntryMessage entry = logger.traceEntry();
setActive(false);
-Thread.currentThread().interrupt();
+//Thread.currentThread().interrupt();
serverSocket.close();
logger.traceExit(entry);
}
(logging-log4j-samples) 17/35: LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 4e67f5432ba6619dd6b5926e085aaea3a2c1ba56
Author: rpopma
AuthorDate: Tue Aug 15 01:24:56 2017 +0900
LOG4J2-2011 replace JCommander command line parser with picocli to let
users run Log4j2 utility applications without requiring an external dependency
---
.../logging/log4j/server/TcpSocketServer.java | 786 ++---
1 file changed, 393 insertions(+), 393 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 51c071c..8ab0089 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -1,393 +1,393 @@
-/*
- * 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.server;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.parser.ParseException;
-import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
-import org.apache.logging.log4j.core.util.Closer;
-import org.apache.logging.log4j.core.util.Log4jThread;
-import org.apache.logging.log4j.message.EntryMessage;
-
-/**
- * Listens for Log4j events on a TCP server socket and passes them on to Log4j.
- *
- * @param
- *The kind of input stream read
- * @see #main(String[])
- */
-public class TcpSocketServer extends
AbstractSocketServer {
-
-protected static class CommandLineArguments extends
AbstractSocketServer.CommandLineArguments {
-
-@Parameter(names = { "--backlog",
-"-b" }, validateWith = PositiveInteger.class, description =
"Server socket backlog.")
-// Same default as ServerSocket
-private int backlog = 50;
-
-int getBacklog() {
-return backlog;
-}
-
-void setBacklog(final int backlog) {
-this.backlog = backlog;
-}
-
-}
-
-/**
- * Thread that processes the events.
- */
-private class SocketHandler extends Log4jThread {
-
-private final T inputStream;
-private final Socket socket;
-
-private volatile boolean shutdown = false;
-
-public SocketHandler(final Socket socket) throws IOException {
-this.socket = socket;
-this.inputStream =
logEventInput.wrapStream(socket.getInputStream());
-}
-
-@Override
-public void run() {
-final EntryMessage entry = logger.traceEntry();
-boolean closed = false;
-try {
-try {
-while (!shutdown) {
-logEventInput.logEvents(inputStream,
TcpSocketServer.this);
-}
-} catch (final EOFException e) {
-closed = true;
-} catch (final OptionalDataException e) {
-logger.error("OptionalDataException eof=" + e.eof + "
length=" + e.length, e);
-} catch (final IOException e) {
-logger.error("IOException encountered while reading from
socket", e);
-} catch (ParseException e) {
-logger.error("ParseException encountered while reading
from socket", e);
-}
-if (!closed) {
-Closer.closeSilently(inputStream);
-}
-} finally {
-
(logging-log4j-samples) 16/35: Better Javadoc and minor clean up.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit da9ba93f590856cd433c98771620f2113e0759c8
Author: ggregory
AuthorDate: Fri Aug 4 08:01:06 2017 -0700
Better Javadoc and minor clean up.
---
.../main/java/org/apache/logging/log4j/server/AbstractSocketServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
index aff7eb1..e2dff83 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
@@ -65,7 +65,7 @@ public abstract class AbstractSocketServer extends LogEve
private boolean interactive;
@Parameter(names = { "--port",
-"-p" }, validateWith = PositiveInteger.class, description =
"Server socket port.")
+"-p" }, validateWith = PositiveInteger.class, description =
"The server port number, or 0 to automatically allocate a port number.")
private int port;
@Parameter(names = { "--localbindaddress",
(logging-log4j-samples) 06/35: [LOG4J2-1994] TcpSocketServer does not close accepted Sockets.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit a7936562560782910bf3298018587ec5da566bc0
Author: Gary Gregory
AuthorDate: Fri Jul 28 16:05:17 2017 -0700
[LOG4J2-1994] TcpSocketServer does not close accepted Sockets.
---
.../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 5 +
1 file changed, 5 insertions(+)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 4d8146b..af458f8 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -71,10 +71,12 @@ public class TcpSocketServer extends
AbstractSocketServer
private class SocketHandler extends Log4jThread {
private final T inputStream;
+private final Socket socket;
private volatile boolean shutdown = false;
public SocketHandler(final Socket socket) throws IOException {
+this.socket = socket;
this.inputStream =
logEventInput.wrapStream(socket.getInputStream());
}
@@ -107,6 +109,9 @@ public class TcpSocketServer extends
AbstractSocketServer
public void shutdown() {
this.shutdown = true;
+if (socket != null) {
+Closer.closeSilently(socket);
+}
interrupt();
}
}
(logging-log4j-samples) 01/35: Move log4j-server to Tools repo
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 400f240cfd155bf5fa0b20b2a16c9edee8befa3e
Author: Mikael Ståldal
AuthorDate: Tue Apr 11 11:05:40 2017 +0200
Move log4j-server to Tools repo
---
log4j-server/pom.xml | 220 ++
.../log4j/server/AbstractLogEventBridge.java | 44 +++
.../logging/log4j/server/AbstractSocketServer.java | 222 ++
.../log4j/server/InputStreamLogEventBridge.java| 103 +++
.../org/apache/logging/log4j/server/JmsServer.java | 148 +
.../server/JsonInputStreamLogEventBridge.java | 90 ++
.../logging/log4j/server/LogEventBridge.java | 57
.../server/ObjectInputStreamLogEventBridge.java| 64
.../log4j/server/SecureTcpSocketServer.java| 37 +++
.../logging/log4j/server/TcpSocketServer.java | 333 +
.../logging/log4j/server/UdpSocketServer.java | 185
.../log4j/server/XmlInputStreamLogEventBridge.java | 54
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 48 +++
.../log4j/server/mom/jms/JmsQueueReceiver.java | 46 +++
.../log4j/server/mom/jms/JmsTopicReceiver.java | 46 +++
.../logging/log4j/server/mom/jms/package-info.java | 26 ++
.../apache/logging/log4j/server/package-info.java | 24 ++
log4j-server/src/site/markdown/index.md| 30 ++
log4j-server/src/site/site.xml | 52
.../log4j/server/AbstractSocketServerTest.java | 237 +++
.../log4j/server/SslXmlSocketServerTest.java | 104 +++
.../log4j/server/TcpJsonSocketServerTest.java | 62
.../server/TcpSerializedSocketServerTest.java | 63
.../log4j/server/TcpXmlSocketServerTest.java | 65
.../logging/log4j/server/ThreadIdFilter.java | 40 +++
.../logging/log4j/server/ThreadNameFilter.java | 39 +++
.../logging/log4j/server/ThreadPriorityFilter.java | 40 +++
.../log4j/server/UdpJsonSocketServerTest.java | 58
.../server/UdpSerializedSocketServerTest.java | 60
.../log4j/server/UdpXmlSocketServerTest.java | 61
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 0 -> 6829 bytes
.../logging/log4j/core/net/ssl/truststore.jks | Bin 0 -> 1487 bytes
32 files changed, 2658 insertions(+)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
new file mode 100644
index 000..5e3c98d
--- /dev/null
+++ b/log4j-server/pom.xml
@@ -0,0 +1,220 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+org.apache.logging.log4j
+log4j-tools
+2.8.3-SNAPSHOT
+../
+
+ log4j-server
+ jar
+ Apache Log4j Server components
+ The Apache Log4j server components
+
+${basedir}/..
+/log4j-server
+
+
+
+ org.apache.logging.log4j
+ log4j-api
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+
+ com.beust
+ jcommander
+
+
+
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
+ provided
+ true
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+ 5.0.2
+
+
+
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+ test-jar
+ test
+
+
+ junit
+ junit
+ test
+
+
+ org.hamcrest
+ hamcrest-all
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-remote-resources-plugin
+
+
+
+ process
+
+
+ false
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
org.apache.logging.log4j.core.net.*
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-changes-plugin
+${changes.plugin.version}
+
+
+
+ changes-report
+
+
+
+
+ %URL%/show_bug.cgi?id=%ISSUE%
+ true
+
+
+
+org.apache.maven.plugins
+maven-checkstyle-plugin
+${checkstyle.plugin.version}
+
+
+ ${log4jParentDir}/checkstyle.xml
+
${log4jParentDir}/checkstyle-suppressions.xml
+ false
+ basedir=${basedir}
+
licensedir=${log4jParentDir}/checkstyle-header.txt
+
+
+
(logging-log4j-samples) 27/35: Fix typo
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit dcba7af0816fdd2ee395562a132c0de81c8a0895
Author: Mikael Ståldal
AuthorDate: Fri Dec 29 12:31:50 2017 +0100
Fix typo
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 6d163fe..71e89e1 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -348,7 +348,7 @@ public class TcpSocketServer extends
AbstractSocketServer
logger.debug("Listening for a connection {}...", serverSocket);
@SuppressWarnings("resource") // clientSocket is closed during
SocketHandler shutdown
final Socket clientSocket = serverSocket.accept();
-logger.debug("Acepted connection on {}...", serverSocket);
+logger.debug("Accepted connection on {}...", serverSocket);
logger.debug("Socket accepted: {}", clientSocket);
clientSocket.setSoLinger(true, 0);
(logging-log4j-samples) 07/35: Remove useless extra parens.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 24b9e9296b5c5223acfe75313be7c0077154b8e5
Author: Gary Gregory
AuthorDate: Fri Jul 28 16:09:51 2017 -0700
Remove useless extra parens.
---
.../java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java| 2 +-
.../java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java | 2 +-
.../org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java | 2 +-
.../java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java| 2 +-
.../java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java | 2 +-
.../org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java | 2 +-
.../java/org/apache/logging/log4j/server/UdpXmlSocketServerTest.java| 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
index 1a51244..1a4acb4 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
@@ -70,7 +70,7 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
initServerSocketFactory();
// Use a large buffer just to test the code, the UDP test uses a tiny
buffer
server = new SecureTcpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
index f12c908..63470dd 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
@@ -31,7 +31,7 @@ public class TcpJsonSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
server = TcpSocketServer.createJsonSocketServer(PORT_NUM);
thread = server.startNewThread();
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
index 275af20..7b0a3c1 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
@@ -32,7 +32,7 @@ public class TcpSerializedSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
server = TcpSocketServer.createSerializedSocketServer(PORT_NUM);
thread = server.startNewThread();
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
index 2b2cfd7..6a0ad13 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
@@ -32,7 +32,7 @@ public class TcpXmlSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
// Use a large buffer just to test the code, the UDP test uses a tiny
buffer
server = new TcpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
Charset.defaultCharset()));
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
index 7bd36f9..e6b6d93 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
@@ -31,7 +31,7 @@ public class UdpJsonSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static
(logging-log4j-samples) branch merge-server updated (85b22d7 -> 9b5372a)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git discard 85b22d7 Upgrade vulnerable dependencies discard 37c156c Restore files discard 03d3589 Move Log4j Server to its own repo discard b802020 [LOG4J2-2493] Remove deprecated code. Still a bit more to do. discard bbf423f [LOG4J2-2493] Remove deprecated code. Still a bit more to do. discard def2008 [LOG4J2-2493] Remove deprecated code. Still a bit more to do. discard de7e3d8 Updates for 3.0.0 modules. discard a8baee8 Fixes to match the main repo at 2.11.1-SNAPSHOT. discard 71d1eff Fix typo discard a39a119 LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge discard f7e68f7 LOG4J2-2163 Use FilteredObjectInputStream from log4j-api discard aa8ac27 Upgrade to latest Log4j discard fac7e02 Formatting. discard 49992b5 Add toString(). discard e84ba79 Add toString(). discard 26eb86d Add util methods for tests. discard 2c37ce9 LOG4J2-2011 moved classes from util.picocli to tools.picocli discard f6635cb LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency discard 09b29e9 Better Javadoc and minor clean up. discard dbf6186 Better Javadoc and minor clean up. discard 52d5161 Closes #1 discard 95f3cff Closes 1 discard 7c81e7e create test-jar, which is used by the log4j-core-its module discard 5d8ff98 Update JMS Server to match updated Appender. Move some classes ActiveMQ JUnit test rule in this module from the Core module. This is to avoid a dependency cycle. discard 7da9e69 Intentionally break compilation to indicate this needs to be fixed discard 1704b09 [LOG4J2-1311] SocketAppender will lose several events after re-connection to server. discard 640f6b3 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment. discard 9537444 Remove useless extra parens. discard ac3e511 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. discard 1d12a84 Match log4j-core 2.9-SNAPSHOT discard 3aa3590 Bump version to 2.9-SNAPSHOT discard 64d9b4a LOG4J2-1958 Read JSON log event by default in TCP and UDP servers discard c07c9ee LOG4J2-1851 Move server components from core to new server module discard 897aed9 Move log4j-server to Tools repo add a8d2900 Basic project setup add e52f10c Migrate `log4j-samples-configuration` module add 720714b Migrate `log4j-samples-loggerProperties` module add e85bfde Migrate `log4j-samples-flume-common` module add 969e67a Update `log4j-samples-flume-remote` module add 029a92e Configure Dependabot and CI add 024e0bc Fix reproducibility test add 146c611 Try to solve build failure on Windows add 251f61d Disable XML plugin on Windows add 95ca086 Bump spring-boot-starter-parent from 2.7.0 to 2.7.8 (#2) add f24a3b1 Bump actions/setup-java from 3.9.0 to 3.10.0 add 9025625 Update version comments add a91bc30 Bump jetty-maven-plugin from 10.0.0 to 10.0.13 (#3) add 513a7b5 Update `log4j-samples-flume-embedded` add ebaf2bd Migrate `log4j-spring-cloud-config-sample-server` add 76ee2b4 Migrate Spring Cloud Sample Application add 5261338 Bump guava from 27.0.1-jre to 31.1-jre (#5) add 51ca347 Bump kubernetes-client-bom from 5.12.4 to 6.4.1 (#4) add b886122 Add a minimal documentation add 9f66616 Formatting errors add dabcea2 Bump spring-boot.version from 2.7.8 to 2.7.9 (#7) add 1546ba0 Bump spring-cloud-dependencies from 2021.0.5 to 2021.0.6 (#10) add cd12f4b Bump spotless-maven-plugin from 2.33.0 to 2.34.0 (#11) add 02f75f0 Bump jetty-maven-plugin from 10.0.13 to 10.0.14 (#12) add 3125afa Bump logging-parent version from 7 to 8 add bcca2e0 Bump version to 2.20.1-SNAPSHOT add b00fcfd Bump kubernetes-client-bom from 6.4.1 to 6.5.0 (#13) add 7af852e Add asynchronous logger example add dc2d771 Bump spotless-maven-plugin from 2.34.0 to 2.35.0 (#14) add 82b93e6 Bump log4j-maven-shade-plugin-extensions from 2.19.0 to 2.20.0 (#15) add 86734c0 Normalize mailing list notification settings add 198c970 Bump actions/checkout from 3.3.0 to 3.4.0 (#16) add 4b0d3e5 Bump flatten-maven-plugin from 1.3.0 to 1.4.0 (#17) add e20d479 Bump kubernetes-client-bom from 6.5.0 to 6.5.1 (#18) add 88f4d64 Bump spring-boot.version from 2.7.9 to 2.7.10 (#19) add b31309b Bump actions/checkout from 3.4.0 to 3.5.0 (#20) add 4a5e64a Bump flatten-maven-plugin from 1.4.0 to 1.4.1 (#21) add f2e81c6 Bump kotlin-bom from 1.8.10 to 1.8.20 (#22) add a0cd253 Bump actions/setup-java from 3.10.0 to 3.11.0 (#23) add 7e662b3 Bump spotless-maven-plugin from 2.35.0 to 2.36.0 (#24) add d4676e0 Bump snakeyaml from 1.33 to 2.0 (#9) add
(logging-log4j-samples) 04/35: Bump version to 2.9-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 34333dcbbc20b980543bb0f6154f8351135e5f0a Author: Mikael Ståldal AuthorDate: Wed Jul 26 21:45:49 2017 +0200 Bump version to 2.9-SNAPSHOT --- log4j-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml index 5e3c98d..29de565 100644 --- a/log4j-server/pom.xml +++ b/log4j-server/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j-tools -2.8.3-SNAPSHOT +2.9-SNAPSHOT ../ log4j-server
(logging-log4j-samples) 05/35: Match log4j-core 2.9-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 73c1b07e00a2584b24450232c1d00ae4a358cc22
Author: Mikael Ståldal
AuthorDate: Wed Jul 26 22:17:09 2017 +0200
Match log4j-core 2.9-SNAPSHOT
---
.../log4j/server/InputStreamLogEventBridge.java | 19 +--
.../org/apache/logging/log4j/server/JmsServer.java| 5 +++--
.../log4j/server/JsonInputStreamLogEventBridge.java | 5 ++---
.../apache/logging/log4j/server/LogEventBridge.java | 5 ++---
.../apache/logging/log4j/server/TcpSocketServer.java | 3 +++
.../apache/logging/log4j/server/UdpSocketServer.java | 3 +++
.../log4j/server/XmlInputStreamLogEventBridge.java| 4 ++--
.../log4j/server/AbstractSocketServerTest.java| 13 ++---
.../log4j/server/UdpSerializedSocketServerTest.java | 2 --
9 files changed, 34 insertions(+), 25 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
index 68ec791..90597c9 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
@@ -22,12 +22,10 @@ import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.core.parser.ParseException;
+import org.apache.logging.log4j.core.parser.TextLogEventParser;
import org.apache.logging.log4j.util.Strings;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-
/**
* Reads and logs {@link LogEvent}s from an {@link InputStream}.
*/
@@ -39,19 +37,20 @@ public abstract class InputStreamLogEventBridge extends
AbstractLogEventBridge {
*the input stream to read
* @param logEventListener
*TODO
- * @throws IOException
*/
-void logEvents(T inputStream, LogEventListener logEventListener) throws
IOException;
+void logEvents(T inputStream, LogEventListener logEventListener) throws
IOException, ParseException;
/**
* Wraps the given stream if needed.
@@ -51,7 +51,6 @@ public interface LogEventBridge {
* @param inputStream
*the stream to wrap
* @return the wrapped stream or the given stream.
- * @throws IOException
*/
T wrapStream(InputStream inputStream) throws IOException;
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index fb9d53b..4d8146b 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentMap;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.validators.PositiveInteger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.parser.ParseException;
import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
import org.apache.logging.log4j.core.util.Closer;
import org.apache.logging.log4j.core.util.Log4jThread;
@@ -92,6 +93,8 @@ public class TcpSocketServer extends
AbstractSocketServer
logger.error("OptionalDataException eof=" + e.eof + "
length=" + e.length, e);
} catch (final IOException e) {
logger.error("IOException encountered while reading from
socket", e);
+} catch (ParseException e) {
+logger.error("ParseException encountered while reading
from socket", e);
}
if (!closed) {
Closer.closeSilently(inputStream);
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 8259427..a19f217 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -27,6 +27,7 @@ import java.net.DatagramSocket;
import java.util.List;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.parser.ParseException;
import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
/**
@@ -169,6 +170,8 @@ public class UdpSocketServer extends
AbstractSocketServer
return;
}
(logging-log4j2) branch recycler-api-3.x deleted (was 1d448788ee)
This is an automated email from the ASF dual-hosted git repository. vy pushed a change to branch recycler-api-3.x in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git was 1d448788ee Merge remote-tracking branch 'origin/main' into recycler-api-3.x The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(logging-log4j-samples) 32/34: Move Log4j Server to its own repo
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 03d3589e6bd79eba3015856037564221ad30781b
Author: Ralph Goers
AuthorDate: Mon Nov 28 22:39:59 2022 -0700
Move Log4j Server to its own repo
---
log4j-server/pom.xml | 242 ---
.../log4j/server/AbstractLogEventBridge.java | 44 ---
.../logging/log4j/server/AbstractSocketServer.java | 217 -
.../log4j/server/InputStreamLogEventBridge.java| 108 ---
.../org/apache/logging/log4j/server/JmsServer.java | 149 -
.../server/JsonInputStreamLogEventBridge.java | 89 --
.../logging/log4j/server/LogEventBridge.java | 56
.../server/ObjectInputStreamLogEventBridge.java| 69 -
.../log4j/server/SecureTcpSocketServer.java| 41 ---
.../logging/log4j/server/TcpSocketServer.java | 341 -
.../logging/log4j/server/UdpSocketServer.java | 167 --
.../log4j/server/XmlInputStreamLogEventBridge.java | 54
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 69 -
.../log4j/server/mom/jms/JmsQueueReceiver.java | 46 ---
.../log4j/server/mom/jms/JmsTopicReceiver.java | 46 ---
.../logging/log4j/server/mom/jms/package-info.java | 26 --
.../apache/logging/log4j/server/package-info.java | 24 --
log4j-server/src/site/markdown/index.md| 30 --
log4j-server/src/site/site.xml | 52
.../log4j/server/AbstractSocketServerTest.java | 240 ---
.../log4j/server/SslXmlSocketServerTest.java | 103 ---
.../log4j/server/TcpJsonSocketServerTest.java | 62
.../log4j/server/TcpXmlSocketServerTest.java | 65
.../logging/log4j/server/ThreadIdFilter.java | 40 ---
.../logging/log4j/server/ThreadNameFilter.java | 39 ---
.../logging/log4j/server/ThreadPriorityFilter.java | 40 ---
.../log4j/server/UdpJsonSocketServerTest.java | 58
.../log4j/server/UdpXmlSocketServerTest.java | 61
.../mom/activemq/ActiveMqBrokerServiceHelper.java | 51 ---
.../mom/activemq/ActiveMqBrokerServiceRule.java| 94 --
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 42 ---
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 6829 -> 0 bytes
.../logging/log4j/core/net/ssl/truststore.jks | Bin 1487 -> 0 bytes
33 files changed, 2765 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
deleted file mode 100644
index 5a78828..000
--- a/log4j-server/pom.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
- 4.0.0
-
-org.apache.logging.log4j
-log4j-tools
-3.0.0-SNAPSHOT
-../
-
- log4j-server
- jar
- Apache Log4j Server components
- The Apache Log4j server components
-
-${basedir}/..
-/log4j-server
-
-
-
- org.apache.logging.log4j
- log4j-core
-
-
- org.apache.logging.log4j
- log4j-jms
- ${project.version}
-
-
- org.apache.logging.log4j
- log4j-layout-jackson-json
- ${project.version}
-
-
- org.apache.logging.log4j
- log4j-layout-jackson-xml
- ${project.version}
-
-
-
- org.jboss.spec.javax.jms
- jboss-jms-api_1.1_spec
- provided
- true
-
-
-
- com.fasterxml.jackson.core
- jackson-databind
-
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-xml
-
-
-
- com.fasterxml.woodstox
- woodstox-core
- 5.0.2
-
-
-
-
-
-
- org.apache.logging.log4j
- log4j-core
- test-jar
- test
-
-
- junit
- junit
- test
-
-
- org.hamcrest
- hamcrest-all
- test
-
-
- org.mockito
- mockito-core
- test
-
-
- org.apache.activemq
- activemq-broker
- test
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-remote-resources-plugin
-
-
-
- process
-
-
- false
-
-
-
-
-
-org.apache.felix
-maven-bundle-plugin
-
-
-
org.apache.logging.log4j.core.net.*
-
-
-
-
-org.apache.maven.plugins
-maven-jar-plugin
-
-
-
- test-jar
-
-
-
-
-
-
-
-
-
-org.apache.maven.plugins
-maven-changes-plugin
-${changes.plugin.version}
-
-
-
- changes-report
-
(logging-log4j-samples) 22/34: Formatting.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit fac7e0257bfe1bfb6c71e91555088897a671648f
Author: Gary Gregory
AuthorDate: Thu Aug 17 14:52:29 2017 -0600
Formatting.
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index bd8604c..52eafcc 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -51,8 +51,7 @@ public class TcpSocketServer extends
AbstractSocketServer
@Command(name = "TcpSocketServer")
protected static class CommandLineArguments extends
AbstractSocketServer.CommandLineArguments {
-@Option(names = { "--backlog",
-"-b" }, description = "Server socket backlog. Must be a
positive integer.")
+@Option(names = { "--backlog", "-b" }, description = "Server socket
backlog. Must be a positive integer.")
// Same default as ServerSocket
private int backlog = 50;
(logging-log4j-samples) 33/34: Restore files
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 37c156c5b4cfdc0771e51538dd185a7b782b8710
Author: Ralph Goers
AuthorDate: Mon Nov 28 22:44:16 2022 -0700
Restore files
---
log4j-server/pom.xml | 242 +++
.../log4j/server/AbstractLogEventBridge.java | 44 +++
.../logging/log4j/server/AbstractSocketServer.java | 217 +
.../log4j/server/InputStreamLogEventBridge.java| 108 +++
.../org/apache/logging/log4j/server/JmsServer.java | 149 +
.../server/JsonInputStreamLogEventBridge.java | 89 ++
.../logging/log4j/server/LogEventBridge.java | 56
.../server/ObjectInputStreamLogEventBridge.java| 69 +
.../log4j/server/SecureTcpSocketServer.java| 41 +++
.../logging/log4j/server/TcpSocketServer.java | 341 +
.../logging/log4j/server/UdpSocketServer.java | 167 ++
.../log4j/server/XmlInputStreamLogEventBridge.java | 54
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 69 +
.../log4j/server/mom/jms/JmsQueueReceiver.java | 46 +++
.../log4j/server/mom/jms/JmsTopicReceiver.java | 46 +++
.../logging/log4j/server/mom/jms/package-info.java | 26 ++
.../apache/logging/log4j/server/package-info.java | 24 ++
log4j-server/src/site/markdown/index.md| 30 ++
log4j-server/src/site/site.xml | 52
.../log4j/server/AbstractSocketServerTest.java | 240 +++
.../log4j/server/SslXmlSocketServerTest.java | 103 +++
.../log4j/server/TcpJsonSocketServerTest.java | 62
.../log4j/server/TcpXmlSocketServerTest.java | 65
.../logging/log4j/server/ThreadIdFilter.java | 40 +++
.../logging/log4j/server/ThreadNameFilter.java | 39 +++
.../logging/log4j/server/ThreadPriorityFilter.java | 40 +++
.../log4j/server/UdpJsonSocketServerTest.java | 58
.../log4j/server/UdpXmlSocketServerTest.java | 61
.../mom/activemq/ActiveMqBrokerServiceHelper.java | 51 +++
.../mom/activemq/ActiveMqBrokerServiceRule.java| 94 ++
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 42 +++
.../log4j/core/net/ssl/client.log4j2-keystore.jks | Bin 0 -> 6829 bytes
.../logging/log4j/core/net/ssl/truststore.jks | Bin 0 -> 1487 bytes
33 files changed, 2765 insertions(+)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
new file mode 100644
index 000..5a78828
--- /dev/null
+++ b/log4j-server/pom.xml
@@ -0,0 +1,242 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+org.apache.logging.log4j
+log4j-tools
+3.0.0-SNAPSHOT
+../
+
+ log4j-server
+ jar
+ Apache Log4j Server components
+ The Apache Log4j server components
+
+${basedir}/..
+/log4j-server
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.apache.logging.log4j
+ log4j-jms
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-json
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-xml
+ ${project.version}
+
+
+
+ org.jboss.spec.javax.jms
+ jboss-jms-api_1.1_spec
+ provided
+ true
+
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+
+
+
+ com.fasterxml.jackson.dataformat
+ jackson-dataformat-xml
+
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+ 5.0.2
+
+
+
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+ test-jar
+ test
+
+
+ junit
+ junit
+ test
+
+
+ org.hamcrest
+ hamcrest-all
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
+
+ org.apache.activemq
+ activemq-broker
+ test
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-remote-resources-plugin
+
+
+
+ process
+
+
+ false
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+
+
+
org.apache.logging.log4j.core.net.*
+
+
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
+ test-jar
+
+
+
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-changes-plugin
+${changes.plugin.version}
+
+
+
+ changes-report
+
+
+
(logging-log4j-samples) 17/34: LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit f6635cbfeb0869192da92be29501c21e6ec7ddb5
Author: rpopma
AuthorDate: Tue Aug 15 01:24:56 2017 +0900
LOG4J2-2011 replace JCommander command line parser with picocli to let
users run Log4j2 utility applications without requiring an external dependency
---
log4j-server/pom.xml | 5 ---
.../logging/log4j/server/AbstractSocketServer.java | 17 +++-
.../logging/log4j/server/TcpSocketServer.java | 45 +++---
.../logging/log4j/server/UdpSocketServer.java | 21 +-
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 4 +-
5 files changed, 42 insertions(+), 50 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 9674ab8..d5493c3 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -40,11 +40,6 @@
org.apache.logging.log4j
log4j-core
-
-
- com.beust
- jcommander
-
org.jboss.spec.javax.jms
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
index e2dff83..4f487f5 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
@@ -30,8 +30,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.LogEventListener;
@@ -41,8 +39,8 @@ import
org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.config.xml.XmlConfiguration;
import org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory;
import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
-import org.apache.logging.log4j.core.util.InetAddressConverter;
import org.apache.logging.log4j.core.util.Log4jThread;
+import org.apache.logging.log4j.core.util.picocli.CommandLine.Option;
import org.apache.logging.log4j.util.Strings;
/**
@@ -57,22 +55,19 @@ public abstract class AbstractSocketServer extends LogEve
protected static class CommandLineArguments extends
BasicCommandLineArguments {
-@Parameter(names = { "--config", "-c" }, description = "Log4j
configuration file location (path or URL).")
+@Option(names = { "--config", "-c" }, description = "Log4j
configuration file location (path or URL).")
private String configLocation;
-@Parameter(names = { "--interactive",
-"-i" }, description = "Accepts commands on standard input
(\"exit\" is the only command).")
+@Option(names = { "--interactive", "-i" }, description = "Accepts
commands on standard input (\"exit\" is the only command).")
private boolean interactive;
-@Parameter(names = { "--port",
-"-p" }, validateWith = PositiveInteger.class, description =
"The server port number, or 0 to automatically allocate a port number.")
+@Option(names = { "--port", "-p" }, description = "The server port
number, or 0 to automatically allocate a port number.")
private int port;
-@Parameter(names = { "--localbindaddress",
-"-a" }, converter = InetAddressConverter.class, description =
"Server socket local bind address.")
+@Option(names = { "--localbindaddress", "-a" }, description = "Server
socket local bind address.")
private InetAddress localBindAddress;
-@Parameter(names = {"--classes", "-C"}, description = "Additional
classes to allow deserialization")
+@Option(names = {"--classes", "-C"}, description = "Additional classes
to allow deserialization")
private List allowedClasses;
String getConfigLocation() {
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 51c071c..50e1d82 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -30,28 +30,29 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
import org.apache.logging.log4j.core.parser.ParseException;
-import
(logging-log4j-samples) 29/34: [LOG4J2-2493] Remove deprecated code. Still a bit more to do.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit def200820031ed4ae99901617b355094b7790970
Author: Gary Gregory
AuthorDate: Mon Oct 29 17:36:03 2018 -0600
[LOG4J2-2493] Remove deprecated code. Still a bit more to do.
---
.../log4j/server/AbstractSocketServerTest.java | 21 ++---
.../log4j/server/SslXmlSocketServerTest.java| 21 ++---
2 files changed, 20 insertions(+), 22 deletions(-)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 0b5fd2d..2e2c0d0 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -190,7 +190,7 @@ public abstract class AbstractSocketServerTest {
socketAppender.start();
final ListAppender listAppender = new ListAppender("Events",
serverFilter, null, false, false);
listAppender.start();
-final PatternLayout layout =
PatternLayout.newBuilder().withPattern("%m %ex%n").build();
+final PatternLayout layout = PatternLayout.newBuilder().setPattern("%m
%ex%n").build();
final ConsoleAppender console =
ConsoleAppender.createDefaultAppenderForLayout(layout);
final Logger serverLogger = ctx.getLogger(this.getClass().getName());
serverLogger.addAppender(console);
@@ -229,16 +229,15 @@ public abstract class AbstractSocketServerTest {
final Layout socketLayout) {
// @formatter:off
return SocketAppender.newBuilder()
-.withProtocol(this.protocol)
-.withHost("localhost")
-.withPort(this.port)
-.withReconnectDelayMillis(-1)
-.withName("test")
-.withImmediateFlush(true)
-.withImmediateFail(false)
-.withIgnoreExceptions(false)
-.withLayout(socketLayout)
-.withFilter(socketFilter)
+.setProtocol(this.protocol)
+.setHost("localhost")
+.setPort(this.port)
+.setReconnectDelayMillis(-1)
+.setName("test")
+.setImmediateFlush(true)
+.setImmediateFail(false)
+.setIgnoreExceptions(false)
+.setLayout(socketLayout).setFilter(socketFilter)
.build();
// @formatter:on
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
index 42a9e9e..6d08723 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
@@ -53,17 +53,16 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
final Layout socketLayout) {
// @formatter:off
return SocketAppender.newBuilder()
-.withProtocol(this.protocol)
-.withHost("localhost")
-.withPort(this.port)
-.withReconnectDelayMillis(-1)
-.withName("test")
-.withImmediateFlush(true)
-.withImmediateFail(false)
-.withIgnoreExceptions(false)
-.withLayout(socketLayout)
-.withFilter(socketFilter)
-.withSslConfiguration(sslConfiguration)
+.setProtocol(this.protocol)
+.setHost("localhost")
+.setPort(this.port)
+.setReconnectDelayMillis(-1)
+.setName("test")
+.setImmediateFlush(true)
+.setImmediateFail(false)
+.setIgnoreExceptions(false)
+.setLayout(socketLayout).setFilter(socketFilter)
+.setSslConfiguration(sslConfiguration)
.build();
// @formatter:on
}
(logging-log4j-samples) 23/34: Upgrade to latest Log4j
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit aa8ac27227be85dff8bdb4749237dfe9ef494216
Author: Mikael Ståldal
AuthorDate: Mon Dec 11 20:41:49 2017 +0100
Upgrade to latest Log4j
---
log4j-server/pom.xml | 2 +-
.../java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index d5493c3..6ef00c5 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
org.apache.logging.log4j
log4j-tools
-2.9-SNAPSHOT
+2.10.1-SNAPSHOT
../
log4j-server
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
index 1a4acb4..42a9e9e 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
@@ -42,9 +42,9 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
private static void initServerSocketFactory() throws
StoreConfigurationException {
final KeyStoreConfiguration ksc = new
KeyStoreConfiguration(TestConstants.KEYSTORE_FILE,
-TestConstants.KEYSTORE_PWD, TestConstants.KEYSTORE_TYPE, null);
+TestConstants.KEYSTORE_PWD(), TestConstants.KEYSTORE_TYPE,
null);
final TrustStoreConfiguration tsc = new
TrustStoreConfiguration(TestConstants.TRUSTSTORE_FILE,
-TestConstants.TRUSTSTORE_PWD, null, null);
+TestConstants.TRUSTSTORE_PWD(), null, null);
sslConfiguration = SslConfiguration.createSSLConfiguration(null, ksc,
tsc);
}
(logging-log4j-samples) 19/34: Add util methods for tests.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 26eb86dc21c01d4bc63797ee9fc65762578a355e
Author: Gary Gregory
AuthorDate: Tue Aug 15 17:08:12 2017 -0600
Add util methods for tests.
---
.../java/org/apache/logging/log4j/server/SecureTcpSocketServer.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
index 81c9d64..39f2afc 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
@@ -23,12 +23,16 @@ import
org.apache.logging.log4j.core.net.ssl.SslConfiguration;
/**
* Listens for events over a secure socket connection (SSL/TLS).
- *
+ *
* @param
*The kind of input stream read
*/
public class SecureTcpSocketServer extends
TcpSocketServer {
+public static SecureTcpSocketServer createJsonServer(final
int port, final SslConfiguration sslConfiguration) throws IOException {
+return new SecureTcpSocketServer<>(port, new
JsonInputStreamLogEventBridge(), sslConfiguration);
+}
+
public SecureTcpSocketServer(final int port, final LogEventBridge
logEventInput,
final SslConfiguration sslConfig) throws IOException {
super(port, logEventInput,
sslConfig.getSslServerSocketFactory().createServerSocket(port));
(logging-log4j-samples) 34/34: Upgrade vulnerable dependencies
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 85b22d74f9b930f9af6f489021249d779422b6bf Author: Piotr P. Karwasz AuthorDate: Tue Nov 14 12:16:28 2023 +0100 Upgrade vulnerable dependencies --- log4j-server/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml index 5a78828..c95fdb2 100644 --- a/log4j-server/pom.xml +++ b/log4j-server/pom.xml @@ -72,7 +72,7 @@ com.fasterxml.woodstox woodstox-core - 5.0.2 + 6.5.1 @@ -80,8 +80,7 @@ org.apache.logging.log4j - log4j-core - test-jar + log4j-core-test test
(logging-log4j-samples) 30/34: [LOG4J2-2493] Remove deprecated code. Still a bit more to do.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit bbf423f3d4cda23101bffd2ed4f34ae132f23505
Author: Gary Gregory
AuthorDate: Mon Oct 29 17:41:37 2018 -0600
[LOG4J2-2493] Remove deprecated code. Still a bit more to do.
---
.../log4j/server/AbstractSocketServerTest.java | 5 --
.../server/TcpSerializedSocketServerTest.java | 63 --
.../server/UdpSerializedSocketServerTest.java | 58
3 files changed, 126 deletions(-)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 2e2c0d0..758716b 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -37,7 +37,6 @@ import
org.apache.logging.log4j.core.appender.AppenderLoggingException;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.SocketAppender;
import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.apache.logging.log4j.core.layout.SerializedLayout;
import org.apache.logging.log4j.core.net.Protocol;
import org.apache.logging.log4j.jackson.json.layout.JsonLayout;
import org.apache.logging.log4j.jackson.xml.layout.XmlLayout;
@@ -98,10 +97,6 @@ public abstract class AbstractSocketServerTest {
protected abstract Layout createLayout();
-protected Layout createSerializedLayout() {
-return SerializedLayout.createLayout();
-}
-
protected Layout createXmlLayout() {
return XmlLayout.newBuilder()
.setLocationInfo(true)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
deleted file mode 100644
index 7b0a3c1..000
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
+++ /dev/null
@@ -1,63 +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.server;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.net.Protocol;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-public class TcpSerializedSocketServerTest extends AbstractSocketServerTest {
-
-private static TcpSocketServer server;
-
-@BeforeClass
-public static void setupClass() throws Exception {
-LoggerContext.getContext(false).reconfigure();
-server = TcpSocketServer.createSerializedSocketServer(PORT_NUM);
-thread = server.startNewThread();
-}
-
-@AfterClass
-public static void tearDownClass() {
-try {
-server.shutdown();
-} catch (final IOException e) {
-e.printStackTrace();
-}
-try {
-thread.join();
-} catch (final InterruptedException e) {
-// ignore
-}
-}
-
-public TcpSerializedSocketServerTest() {
-super(Protocol.TCP, PORT, false);
-}
-
-@Override
-protected Layout createLayout() {
-return super.createSerializedLayout();
-}
-
-}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java
deleted file mode 100644
index be826c9..000
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java
+++ /dev/null
@@ -1,58 +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
(logging-log4j-samples) 20/34: Add toString().
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit e84ba795d4a172f4c739d5315ba6db5fe4c73e7a
Author: Gary Gregory
AuthorDate: Thu Aug 17 14:04:26 2017 -0600
Add toString().
---
.../logging/log4j/server/TcpSocketServer.java | 794 +++--
.../logging/log4j/server/UdpSocketServer.java | 6 +
2 files changed, 406 insertions(+), 394 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 90b2f29..bd8604c 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -1,394 +1,400 @@
-/*
- * 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.server;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.parser.ParseException;
-import org.apache.logging.log4j.core.util.Closer;
-import org.apache.logging.log4j.core.util.Log4jThread;
-import org.apache.logging.log4j.core.tools.picocli.CommandLine;
-import org.apache.logging.log4j.core.tools.picocli.CommandLine.Command;
-import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option;
-import org.apache.logging.log4j.message.EntryMessage;
-
-/**
- * Listens for Log4j events on a TCP server socket and passes them on to Log4j.
- *
- * @param
- *The kind of input stream read
- * @see #main(String[])
- */
-public class TcpSocketServer extends
AbstractSocketServer {
-
-@Command(name = "TcpSocketServer")
-protected static class CommandLineArguments extends
AbstractSocketServer.CommandLineArguments {
-
-@Option(names = { "--backlog",
-"-b" }, description = "Server socket backlog. Must be a
positive integer.")
-// Same default as ServerSocket
-private int backlog = 50;
-
-int getBacklog() {
-return backlog;
-}
-
-void setBacklog(final int backlog) {
-this.backlog = backlog;
-}
-}
-
-/**
- * Thread that processes the events.
- */
-private class SocketHandler extends Log4jThread {
-
-private final T inputStream;
-private final Socket socket;
-
-private volatile boolean shutdown = false;
-
-public SocketHandler(final Socket socket) throws IOException {
-this.socket = socket;
-this.inputStream =
logEventInput.wrapStream(socket.getInputStream());
-}
-
-@Override
-public void run() {
-final EntryMessage entry = logger.traceEntry();
-boolean closed = false;
-try {
-try {
-while (!shutdown) {
-logEventInput.logEvents(inputStream,
TcpSocketServer.this);
-}
-} catch (final EOFException e) {
-closed = true;
-} catch (final OptionalDataException e) {
-logger.error("OptionalDataException eof=" + e.eof + "
length=" + e.length, e);
-} catch (final IOException e) {
-logger.error("IOException encountered while reading from
socket", e);
-} catch (ParseException e) {
-logger.error("ParseException encountered while reading
from socket", e);
-}
-if (!closed) {
-Closer.closeSilently(inputStream);
-}
-} finally {
-
(logging-log4j-samples) 28/34: Updates for 3.0.0 modules.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit de7e3d82e84ec336cfd285f720a6546cf805bdb9
Author: Gary Gregory
AuthorDate: Mon Jun 4 18:33:43 2018 -0600
Updates for 3.0.0 modules.
---
log4j-server/pom.xml| 17 ++---
.../java/org/apache/logging/log4j/server/JmsServer.java | 4 ++--
.../log4j/server/JsonInputStreamLogEventBridge.java | 2 +-
.../log4j/server/XmlInputStreamLogEventBridge.java | 2 +-
.../logging/log4j/server/AbstractSocketServerTest.java | 10 ++
5 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 10868b9..5a78828 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
org.apache.logging.log4j
log4j-tools
-2.11.1-SNAPSHOT
+3.0.0-SNAPSHOT
../
log4j-server
@@ -34,11 +34,22 @@
org.apache.logging.log4j
- log4j-api
+ log4j-core
org.apache.logging.log4j
- log4j-core
+ log4j-jms
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-json
+ ${project.version}
+
+
+ org.apache.logging.log4j
+ log4j-layout-jackson-xml
+ ${project.version}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index a6cf9cc..e46632c 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -36,9 +36,9 @@ import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LifeCycle2;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
-import org.apache.logging.log4j.core.appender.mom.JmsAppender;
-import org.apache.logging.log4j.core.appender.mom.JmsManager;
import org.apache.logging.log4j.core.net.JndiManager;
+import org.apache.logging.log4j.jms.appender.JmsAppender;
+import org.apache.logging.log4j.jms.appender.JmsManager;
/**
* LogEventListener server that receives LogEvents over a JMS {@link
javax.jms.Destination}.
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
index ae1b0df..8444c74 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JsonInputStreamLogEventBridge.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.parser.JsonLogEventParser;
+import org.apache.logging.log4j.jackson.json.parser.JsonLogEventParser;
import org.apache.logging.log4j.util.Chars;
/**
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
index b042bf9..3c4a1e0 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/XmlInputStreamLogEventBridge.java
@@ -20,7 +20,7 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.parser.XmlLogEventParser;
+import org.apache.logging.log4j.jackson.xml.parser.XmlLogEventParser;
/**
* Reads and logs {@link LogEvent}s from an {@link InputStream}.
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
index 404bbf6..0b5fd2d 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/AbstractSocketServerTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.logging.log4j.server;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.Arrays;
@@ -32,19 +36,17 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.appender.AppenderLoggingException;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.appender.SocketAppender;
-import
(logging-log4j-samples) 26/34: Fix typo
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 71d1eff6c0149163111f1bcca98fc8092bc1fa36
Author: Mikael Ståldal
AuthorDate: Fri Dec 29 12:31:50 2017 +0100
Fix typo
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 6d163fe..71e89e1 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -348,7 +348,7 @@ public class TcpSocketServer extends
AbstractSocketServer
logger.debug("Listening for a connection {}...", serverSocket);
@SuppressWarnings("resource") // clientSocket is closed during
SocketHandler shutdown
final Socket clientSocket = serverSocket.accept();
-logger.debug("Acepted connection on {}...", serverSocket);
+logger.debug("Accepted connection on {}...", serverSocket);
logger.debug("Socket accepted: {}", clientSocket);
clientSocket.setSoLinger(true, 0);
(logging-log4j-samples) 31/34: [LOG4J2-2493] Remove deprecated code. Still a bit more to do.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit b8020202f77c07943e40bce08a8cda887f231a98
Author: Gary Gregory
AuthorDate: Mon Oct 29 17:45:20 2018 -0600
[LOG4J2-2493] Remove deprecated code. Still a bit more to do.
---
.../logging/log4j/server/TcpSocketServer.java | 61 --
.../logging/log4j/server/UdpSocketServer.java | 30 ---
2 files changed, 91 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 71e89e1..c3f5ae7 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -152,67 +152,6 @@ public class TcpSocketServer
extends AbstractSocketServer
return LOGGER.exit(socketServer);
}
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *The port number, or 0 to automatically allocate a port number.
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- */
-@Deprecated
-public static TcpSocketServer
createSerializedSocketServer(final int port) throws IOException {
-LOGGER.entry(port);
-final TcpSocketServer socketServer = new
TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge());
-return LOGGER.exit(socketServer);
-}
-
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *The port number, or 0 to automatically allocate a port number.
- * @param backlog
- *The server socket backlog.
- * @param localBindAddress
- *The local InetAddress the server will bind to
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- * @since 2.7
- */
-@Deprecated
-public static TcpSocketServer
createSerializedSocketServer(final int port, final int backlog,
-final InetAddress localBindAddress) throws IOException {
-return createSerializedSocketServer(port, backlog, localBindAddress,
Collections.emptyList());
-}
-
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *The port number, or 0 to automatically allocate a port number.
- * @param backlog
- *The server socket backlog.
- * @param localBindAddress
- *The local InetAddress the server will bind to
- * @param allowedClasses additional class names to allow for
deserialization
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- * @since 2.8.2
- */
-@Deprecated
-public static TcpSocketServer
createSerializedSocketServer(
-final int port, final int backlog, final InetAddress localBindAddress,
final List allowedClasses
-) throws IOException {
-LOGGER.entry(port);
-final TcpSocketServer socketServer = new
TcpSocketServer<>(port, backlog, localBindAddress,
-new ObjectInputStreamLogEventBridge(allowedClasses));
-return LOGGER.exit(socketServer);
-}
-
/**
* Creates a socket server that reads XML log events.
*
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 17a7cdd..6148ad8 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -52,36 +52,6 @@ public class UdpSocketServer extends
AbstractSocketServer
return new UdpSocketServer<>(port, new
JsonInputStreamLogEventBridge());
}
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port
- *the port to listen
- * @return a new a socket server
- * @throws IOException
- * if an I/O error occurs when opening the socket.
- */
-@Deprecated
-public static UdpSocketServer
createSerializedSocketServer(final int port) throws IOException {
-return new UdpSocketServer<>(port, new
ObjectInputStreamLogEventBridge());
-}
-
-/**
- * Creates a socket server that reads serialized log events.
- *
- * @param port the port to listen
- * @param allowedClasses additional classes to allow for deserialization
- * @return a new a socket server
- * @throws IOException if an I/O error occurs when opening the
(logging-log4j-samples) 25/34: LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit a39a119f6cc07d7c000456dbd95f3e3b1b7dd799
Author: Mikael Ståldal
AuthorDate: Fri Dec 29 12:31:25 2017 +0100
LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge
---
.../logging/log4j/server/ObjectInputStreamLogEventBridge.java | 7 ++-
.../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 3 +++
.../main/java/org/apache/logging/log4j/server/UdpSocketServer.java | 2 ++
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index 428ab83..c5ab4eb 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@ -25,10 +25,15 @@ import java.util.List;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
import org.apache.logging.log4j.util.FilteredObjectInputStream;
+import org.apache.logging.log4j.core.layout.SerializedLayout;
/**
- * Reads and logs serialized {@link LogEvent} objects from an {@link
ObjectInputStream}.
+ * Reads and logs serialized {@link LogEvent} objects (created with {@link
SerializedLayout}) from an {@link ObjectInputStream}.
+ *
+ * @deprecated Java Serialization has inherent security weaknesses, see
https://www.owasp.org/index.php/Deserialization_of_untrusted_data .
+ * Therefore {@link SerializedLayout} is deprecated, and so is this class. We
recommend using {@link JsonInputStreamLogEventBridge} instead.
*/
+@Deprecated
public class ObjectInputStreamLogEventBridge extends
AbstractLogEventBridge {
private final List allowedClasses;
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 52eafcc..6d163fe 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -161,6 +161,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* @throws IOException
* if an I/O error occurs when opening the socket.
*/
+@Deprecated
public static TcpSocketServer
createSerializedSocketServer(final int port) throws IOException {
LOGGER.entry(port);
final TcpSocketServer socketServer = new
TcpSocketServer<>(port, new ObjectInputStreamLogEventBridge());
@@ -181,6 +182,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* if an I/O error occurs when opening the socket.
* @since 2.7
*/
+@Deprecated
public static TcpSocketServer
createSerializedSocketServer(final int port, final int backlog,
final InetAddress localBindAddress) throws IOException {
return createSerializedSocketServer(port, backlog, localBindAddress,
Collections.emptyList());
@@ -201,6 +203,7 @@ public class TcpSocketServer extends
AbstractSocketServer
* if an I/O error occurs when opening the socket.
* @since 2.8.2
*/
+@Deprecated
public static TcpSocketServer
createSerializedSocketServer(
final int port, final int backlog, final InetAddress localBindAddress,
final List allowedClasses
) throws IOException {
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 8f53e03..17a7cdd 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -61,6 +61,7 @@ public class UdpSocketServer extends
AbstractSocketServer
* @throws IOException
* if an I/O error occurs when opening the socket.
*/
+@Deprecated
public static UdpSocketServer
createSerializedSocketServer(final int port) throws IOException {
return new UdpSocketServer<>(port, new
ObjectInputStreamLogEventBridge());
}
@@ -74,6 +75,7 @@ public class UdpSocketServer extends
AbstractSocketServer
* @throws IOException if an I/O error occurs when opening the socket.
* @since 2.8.2
*/
+@Deprecated
public static UdpSocketServer
createSerializedSocketServer(final int port,
final List allowedClasses)
throws IOException {
(logging-log4j-samples) 02/34: LOG4J2-1851 Move server components from core to new server module
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit c07c9ee8d5a4e0ab0314d17e11667af5b039ab66
Author: Mikael Ståldal
AuthorDate: Fri Apr 21 15:24:47 2017 +0200
LOG4J2-1851 Move server components from core to new server module
---
.../log4j/server/FilteredObjectInputStream.java| 67 ++
.../server/ObjectInputStreamLogEventBridge.java| 1 -
2 files changed, 67 insertions(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
new file mode 100644
index 000..c5bf92f
--- /dev/null
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
@@ -0,0 +1,67 @@
+/*
+ * 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.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Extended ObjectInputStream that only allows certain classes to be
deserialized.
+ *
+ * @since 2.8.2
+ */
+public class FilteredObjectInputStream extends ObjectInputStream {
+
+private static final List REQUIRED_JAVA_CLASSES = Arrays.asList(
+// for StandardLevel
+"java.lang.Enum",
+// for location information
+"java.lang.StackTraceElement",
+// for Message delegate
+"java.rmi.MarshalledObject",
+"[B"
+);
+
+private final Collection allowedClasses;
+
+public FilteredObjectInputStream(final InputStream in, final
Collection allowedClasses) throws IOException {
+super(in);
+this.allowedClasses = allowedClasses;
+}
+
+@Override
+protected Class resolveClass(final ObjectStreamClass desc) throws
IOException, ClassNotFoundException {
+String name = desc.getName();
+if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) {
+throw new InvalidObjectException("Class is not allowed for
deserialization: " + name);
+}
+return super.resolveClass(desc);
+}
+
+private static boolean isAllowedByDefault(final String name) {
+return name.startsWith("org.apache.logging.log4j.") ||
+name.startsWith("[Lorg.apache.logging.log4j.") ||
+REQUIRED_JAVA_CLASSES.contains(name);
+}
+
+}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index ddd2e26..0f4a06f 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
-import org.apache.logging.log4j.core.util.FilteredObjectInputStream;
/**
* Reads and logs serialized {@link LogEvent} objects from an {@link
ObjectInputStream}.
(logging-log4j-samples) branch merge-server created (now 85b22d7)
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a change to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git at 85b22d7 Upgrade vulnerable dependencies This branch includes the following new commits: new 897aed9 Move log4j-server to Tools repo new c07c9ee LOG4J2-1851 Move server components from core to new server module new 64d9b4a LOG4J2-1958 Read JSON log event by default in TCP and UDP servers new 3aa3590 Bump version to 2.9-SNAPSHOT new 1d12a84 Match log4j-core 2.9-SNAPSHOT new ac3e511 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. new 9537444 Remove useless extra parens. new 640f6b3 [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment. new 1704b09 [LOG4J2-1311] SocketAppender will lose several events after re-connection to server. new 7da9e69 Intentionally break compilation to indicate this needs to be fixed new 5d8ff98 Update JMS Server to match updated Appender. Move some classes ActiveMQ JUnit test rule in this module from the Core module. This is to avoid a dependency cycle. new 7c81e7e create test-jar, which is used by the log4j-core-its module new 95f3cff Closes 1 new 52d5161 Closes #1 new dbf6186 Better Javadoc and minor clean up. new 09b29e9 Better Javadoc and minor clean up. new f6635cb LOG4J2-2011 replace JCommander command line parser with picocli to let users run Log4j2 utility applications without requiring an external dependency new 2c37ce9 LOG4J2-2011 moved classes from util.picocli to tools.picocli new 26eb86d Add util methods for tests. new e84ba79 Add toString(). new 49992b5 Add toString(). new fac7e02 Formatting. new aa8ac27 Upgrade to latest Log4j new f7e68f7 LOG4J2-2163 Use FilteredObjectInputStream from log4j-api new a39a119 LOG4J2-2163 Deprecate ObjectInputStreamLogEventBridge new 71d1eff Fix typo new a8baee8 Fixes to match the main repo at 2.11.1-SNAPSHOT. new de7e3d8 Updates for 3.0.0 modules. new def2008 [LOG4J2-2493] Remove deprecated code. Still a bit more to do. new bbf423f [LOG4J2-2493] Remove deprecated code. Still a bit more to do. new b802020 [LOG4J2-2493] Remove deprecated code. Still a bit more to do. new 03d3589 Move Log4j Server to its own repo new 37c156c Restore files new 85b22d7 Upgrade vulnerable dependencies The 34 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(logging-log4j-samples) 27/34: Fixes to match the main repo at 2.11.1-SNAPSHOT.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit a8baee85907181b1b14b427de8fc2785dbb2aef1
Author: Gary Gregory
AuthorDate: Mon Jun 4 16:53:39 2018 -0600
Fixes to match the main repo at 2.11.1-SNAPSHOT.
---
log4j-server/pom.xml | 2 +-
.../org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 6ef00c5..10868b9 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -20,7 +20,7 @@
org.apache.logging.log4j
log4j-tools
-2.10.1-SNAPSHOT
+2.11.1-SNAPSHOT
../
log4j-server
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
index 891a4e0..ba6ea87 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/mom/jms/JmsQueueReceiverTest.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.server.mom.jms;
import org.apache.logging.log4j.server.mom.activemq.ActiveMqBrokerServiceRule;
-import org.apache.logging.log4j.test.AvailablePortSystemPropertyRule;
+import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
import org.junit.ClassRule;
import org.junit.Test;
@@ -25,7 +25,7 @@ import org.junit.rules.RuleChain;
public class JmsQueueReceiverTest {
-private static final AvailablePortSystemPropertyRule portRule =
AvailablePortSystemPropertyRule
+private static final AvailablePortSystemPropertyTestRule portRule =
AvailablePortSystemPropertyTestRule
.create(ActiveMqBrokerServiceRule.PORT_PROPERTY_NAME);
private static final ActiveMqBrokerServiceRule activeMqBrokerServiceRule =
new ActiveMqBrokerServiceRule(
(logging-log4j-samples) 14/34: Closes #1
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 52d5161da60bc6305863c57cd60b7a146a223bcc Author: Mikael Ståldal AuthorDate: Tue Aug 1 21:30:16 2017 +0200 Closes #1
(logging-log4j-samples) 24/34: LOG4J2-2163 Use FilteredObjectInputStream from log4j-api
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit f7e68f74a5deba6735e1d35c6c08475774386546
Author: Mikael Ståldal
AuthorDate: Fri Dec 29 12:19:53 2017 +0100
LOG4J2-2163 Use FilteredObjectInputStream from log4j-api
---
.../log4j/server/FilteredObjectInputStream.java| 67 --
.../server/ObjectInputStreamLogEventBridge.java| 1 +
2 files changed, 1 insertion(+), 67 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
deleted file mode 100644
index c5bf92f..000
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/FilteredObjectInputStream.java
+++ /dev/null
@@ -1,67 +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.server;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Extended ObjectInputStream that only allows certain classes to be
deserialized.
- *
- * @since 2.8.2
- */
-public class FilteredObjectInputStream extends ObjectInputStream {
-
-private static final List REQUIRED_JAVA_CLASSES = Arrays.asList(
-// for StandardLevel
-"java.lang.Enum",
-// for location information
-"java.lang.StackTraceElement",
-// for Message delegate
-"java.rmi.MarshalledObject",
-"[B"
-);
-
-private final Collection allowedClasses;
-
-public FilteredObjectInputStream(final InputStream in, final
Collection allowedClasses) throws IOException {
-super(in);
-this.allowedClasses = allowedClasses;
-}
-
-@Override
-protected Class resolveClass(final ObjectStreamClass desc) throws
IOException, ClassNotFoundException {
-String name = desc.getName();
-if (!(isAllowedByDefault(name) || allowedClasses.contains(name))) {
-throw new InvalidObjectException("Class is not allowed for
deserialization: " + name);
-}
-return super.resolveClass(desc);
-}
-
-private static boolean isAllowedByDefault(final String name) {
-return name.startsWith("org.apache.logging.log4j.") ||
-name.startsWith("[Lorg.apache.logging.log4j.") ||
-REQUIRED_JAVA_CLASSES.contains(name);
-}
-
-}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
index 0f4a06f..428ab83 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/ObjectInputStreamLogEventBridge.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
+import org.apache.logging.log4j.util.FilteredObjectInputStream;
/**
* Reads and logs serialized {@link LogEvent} objects from an {@link
ObjectInputStream}.
(logging-log4j-samples) 18/34: LOG4J2-2011 moved classes from util.picocli to tools.picocli
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 2c37ce97cb3e67e7075640d626a9cfaf8b042522 Author: rpopma AuthorDate: Wed Aug 16 07:24:48 2017 +0900 LOG4J2-2011 moved classes from util.picocli to tools.picocli --- .../java/org/apache/logging/log4j/server/AbstractSocketServer.java | 4 ++-- .../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 6 +++--- .../main/java/org/apache/logging/log4j/server/UdpSocketServer.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java index 4f487f5..2024b6b 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java @@ -38,9 +38,9 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationSource; import org.apache.logging.log4j.core.config.xml.XmlConfiguration; import org.apache.logging.log4j.core.config.xml.XmlConfigurationFactory; -import org.apache.logging.log4j.core.util.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.BasicCommandLineArguments; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; import org.apache.logging.log4j.util.Strings; /** diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java index 50e1d82..90b2f29 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java @@ -34,9 +34,9 @@ import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.core.util.Log4jThread; -import org.apache.logging.log4j.core.util.picocli.CommandLine; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Command; -import org.apache.logging.log4j.core.util.picocli.CommandLine.Option; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Command; +import org.apache.logging.log4j.core.tools.picocli.CommandLine.Option; import org.apache.logging.log4j.message.EntryMessage; /** diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java index 533c4b2..4229003 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java @@ -28,7 +28,7 @@ import java.util.List; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.parser.ParseException; -import org.apache.logging.log4j.core.util.picocli.CommandLine; +import org.apache.logging.log4j.core.tools.picocli.CommandLine; /** * Listens for Log4j events on a datagram socket and passes them on to Log4j.
(logging-log4j-samples) 10/34: Intentionally break compilation to indicate this needs to be fixed
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 7da9e6989db34e7bc587d2e782c7a7fec68b41f3
Author: Mikael Ståldal
AuthorDate: Sun Jul 30 10:53:25 2017 +0200
Intentionally break compilation to indicate this needs to be fixed
---
.../src/main/java/org/apache/logging/log4j/server/JmsServer.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index 8bc549c..70477db 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -54,7 +54,7 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
final String username,
final String password) {
final String managerName = JmsServer.class.getName() + '@' +
JmsServer.class.hashCode();
-final Properties jndiManager = JndiManager.createProperties("", "",
"", "", "", new Properties());
+// TODO init JmsManager properly
jmsManager = JmsManager.getJmsManager(managerName, jndiManager,
connectionFactoryBindingName,
destinationBindingName, username, password.toCharArray(), false,
0L);
}
(logging-log4j-samples) 09/34: [LOG4J2-1311] SocketAppender will lose several events after re-connection to server.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 1704b09fef8b55fe134b81b844d26ed7743a4dce
Author: Gary Gregory
AuthorDate: Sat Jul 29 00:54:16 2017 -0700
[LOG4J2-1311] SocketAppender will lose several events after
re-connection to server.
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 7fde56b..ae1c592 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -389,7 +389,7 @@ public class TcpSocketServer extends
AbstractSocketServer
public void shutdown() throws IOException {
final EntryMessage entry = logger.traceEntry();
setActive(false);
-Thread.currentThread().interrupt();
+//Thread.currentThread().interrupt();
serverSocket.close();
logger.traceExit(entry);
}
(logging-log4j-samples) 16/34: Better Javadoc and minor clean up.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 09b29e99337e46243c9cb27995fa7cb9aca817f0
Author: ggregory
AuthorDate: Fri Aug 4 08:01:06 2017 -0700
Better Javadoc and minor clean up.
---
.../main/java/org/apache/logging/log4j/server/AbstractSocketServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
index aff7eb1..e2dff83 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/AbstractSocketServer.java
@@ -65,7 +65,7 @@ public abstract class AbstractSocketServer extends LogEve
private boolean interactive;
@Parameter(names = { "--port",
-"-p" }, validateWith = PositiveInteger.class, description =
"Server socket port.")
+"-p" }, validateWith = PositiveInteger.class, description =
"The server port number, or 0 to automatically allocate a port number.")
private int port;
@Parameter(names = { "--localbindaddress",
(logging-log4j-samples) 13/34: Closes 1
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 95f3cff88a337c176b116fb3e1ec4c284989941d Author: Mikael Ståldal AuthorDate: Tue Aug 1 21:12:08 2017 +0200 Closes 1
(logging-log4j-samples) 11/34: Update JMS Server to match updated Appender. Move some classes ActiveMQ JUnit test rule in this module from the Core module. This is to avoid a dependency cycle.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 5d8ff98477f759e89913ad2470321285744d8486
Author: Gary Gregory
AuthorDate: Sun Jul 30 13:52:12 2017 -0700
Update JMS Server to match updated Appender. Move some classes ActiveMQ
JUnit test rule in this module from the Core module. This is to avoid a
dependency cycle.
---
log4j-server/pom.xml | 5 ++
.../org/apache/logging/log4j/server/JmsServer.java | 22 ++---
.../logging/log4j/server/UdpSocketServer.java | 2 +-
.../log4j/server/mom/jms/AbstractJmsReceiver.java | 33 ++--
.../log4j/server/mom/jms/JmsQueueReceiver.java | 8 +-
.../log4j/server/mom/jms/JmsTopicReceiver.java | 6 +-
.../mom/activemq/ActiveMqBrokerServiceHelper.java | 51
.../mom/activemq/ActiveMqBrokerServiceRule.java| 94 ++
.../log4j/server/mom/jms/JmsQueueReceiverTest.java | 42 ++
9 files changed, 238 insertions(+), 25 deletions(-)
diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml
index 29de565..36098e0 100644
--- a/log4j-server/pom.xml
+++ b/log4j-server/pom.xml
@@ -93,6 +93,11 @@
mockito-core
test
+
+ org.apache.activemq
+ activemq-broker
+ test
+
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
index 70477db..a6cf9cc 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/JmsServer.java
@@ -24,6 +24,7 @@ import java.nio.charset.Charset;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -35,6 +36,7 @@ import org.apache.logging.log4j.core.AbstractLifeCycle;
import org.apache.logging.log4j.core.LifeCycle2;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
+import org.apache.logging.log4j.core.appender.mom.JmsAppender;
import org.apache.logging.log4j.core.appender.mom.JmsManager;
import org.apache.logging.log4j.core.net.JndiManager;
@@ -49,14 +51,14 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
private final JmsManager jmsManager;
private MessageConsumer messageConsumer;
-public JmsServer(final String connectionFactoryBindingName,
- final String destinationBindingName,
- final String username,
- final String password) {
+public JmsServer(final String connectionFactoryBindingName, final String
connectionFactoryName,
+final String providerURL, final String destinationBindingName,
final String username, final char[] password,
+final Properties jndiProperties) {
final String managerName = JmsServer.class.getName() + '@' +
JmsServer.class.hashCode();
-// TODO init JmsManager properly
-jmsManager = JmsManager.getJmsManager(managerName, jndiManager,
connectionFactoryBindingName,
-destinationBindingName, username, password.toCharArray(), false,
0L);
+final Properties jndiManager =
JndiManager.createProperties(connectionFactoryBindingName, providerURL, null,
+null, null, jndiProperties);
+jmsManager = JmsManager.getJmsManager(managerName, jndiManager,
connectionFactoryName, destinationBindingName,
+username, password, false,
JmsAppender.Builder.DEFAULT_RECONNECT_INTERVAL_MILLIS);
}
@Override
@@ -76,7 +78,7 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
}
} else {
LOGGER.warn("Received message of type {} and JMSType {} which
cannot be handled.", message.getClass(),
-message.getJMSType());
+message.getJMSType());
}
} catch (final JMSException e) {
LOGGER.catching(e);
@@ -130,10 +132,8 @@ public class JmsServer extends LogEventListener implements
MessageListener, Life
* Starts and runs this server until the user types "exit" into standard
input.
*
* @throws IOException
- * @since 2.6
*/
-public void run() throws IOException {
-this.start();
+public void commandLineLoop() throws IOException {
System.out.println("Type \"exit\" to quit.");
final BufferedReader stdin = new BufferedReader(new
InputStreamReader(System.in, Charset.defaultCharset()));
while (true) {
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
(logging-log4j-samples) 15/34: Better Javadoc and minor clean up.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit dbf61866a521be1aba56a67d4026ac591d7b90a6
Author: ggregory
AuthorDate: Fri Aug 4 08:00:29 2017 -0700
Better Javadoc and minor clean up.
---
.../logging/log4j/server/TcpSocketServer.java | 789 ++---
1 file changed, 393 insertions(+), 396 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index ae1c592..51c071c 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -1,396 +1,393 @@
-/*
- * 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.server;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.OptionalDataException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import com.beust.jcommander.Parameter;
-import com.beust.jcommander.validators.PositiveInteger;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.parser.ParseException;
-import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
-import org.apache.logging.log4j.core.util.Closer;
-import org.apache.logging.log4j.core.util.Log4jThread;
-import org.apache.logging.log4j.message.EntryMessage;
-
-/**
- * Listens for Log4j events on a TCP server socket and passes them on to Log4j.
- *
- * @param
- *The kind of input stream read
- * @see #main(String[])
- */
-public class TcpSocketServer extends
AbstractSocketServer {
-
-protected static class CommandLineArguments extends
AbstractSocketServer.CommandLineArguments {
-
-@Parameter(names = { "--backlog",
-"-b" }, validateWith = PositiveInteger.class, description =
"Server socket backlog.")
-// Same default as ServerSocket
-private int backlog = 50;
-
-int getBacklog() {
-return backlog;
-}
-
-void setBacklog(final int backlog) {
-this.backlog = backlog;
-}
-
-}
-
-/**
- * Thread that processes the events.
- */
-private class SocketHandler extends Log4jThread {
-
-private final T inputStream;
-private final Socket socket;
-
-private volatile boolean shutdown = false;
-
-public SocketHandler(final Socket socket) throws IOException {
-this.socket = socket;
-this.inputStream =
logEventInput.wrapStream(socket.getInputStream());
-}
-
-@Override
-public void run() {
-final EntryMessage entry = logger.traceEntry();
-boolean closed = false;
-try {
-try {
-while (!shutdown) {
-logEventInput.logEvents(inputStream,
TcpSocketServer.this);
-}
-} catch (final EOFException e) {
-closed = true;
-} catch (final OptionalDataException e) {
-logger.error("OptionalDataException eof=" + e.eof + "
length=" + e.length, e);
-} catch (final IOException e) {
-logger.error("IOException encountered while reading from
socket", e);
-} catch (ParseException e) {
-logger.error("ParseException encountered while reading
from socket", e);
-}
-if (!closed) {
-Closer.closeSilently(inputStream);
-}
-} finally {
-handlers.remove(Long.valueOf(getId()));
-}
-logger.traceExit(entry);
-}
-
-public void
(logging-log4j-samples) 12/34: create test-jar, which is used by the log4j-core-its module
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 7c81e7ea91130365586cdfc01b9941e12982111c Author: Pascal Schumacher AuthorDate: Mon Jul 31 20:20:07 2017 +0200 create test-jar, which is used by the log4j-core-its module --- log4j-server/pom.xml | 11 +++ 1 file changed, 11 insertions(+) diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml index 36098e0..9674ab8 100644 --- a/log4j-server/pom.xml +++ b/log4j-server/pom.xml @@ -125,6 +125,17 @@ + +org.apache.maven.plugins +maven-jar-plugin + + + + test-jar + + + +
(logging-log4j-samples) 21/34: Add toString().
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 49992b5eed7b06e3b39ec72299b853c203483616 Author: Gary Gregory AuthorDate: Thu Aug 17 14:11:55 2017 -0600 Add toString(). --- .../org/apache/logging/log4j/server/InputStreamLogEventBridge.java | 6 ++ 1 file changed, 6 insertions(+) diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java index 90597c9..6d66303 100644 --- a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java +++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java @@ -99,4 +99,10 @@ public abstract class InputStreamLogEventBridge extends AbstractLogEventBridge
(logging-log4j-samples) 08/34: [LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 640f6b369a0b7d5d5b79061e10a7f872e74cd3b0
Author: Gary Gregory
AuthorDate: Fri Jul 28 16:11:00 2017 -0700
[LOG4J2-1994] TcpSocketServer does not close accepted Sockets. Comment.
---
.../src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index af458f8..7fde56b 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -346,6 +346,7 @@ public class TcpSocketServer extends
AbstractSocketServer
try {
// Accept incoming connections.
logger.debug("Listening for a connection {}...", serverSocket);
+@SuppressWarnings("resource") // clientSocket is closed during
SocketHandler shutdown
final Socket clientSocket = serverSocket.accept();
logger.debug("Acepted connection on {}...", serverSocket);
logger.debug("Socket accepted: {}", clientSocket);
(logging-log4j-samples) 04/34: Bump version to 2.9-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch merge-server in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git commit 3aa3590d39b1d366320341424cdbbbe0e38852d0 Author: Mikael Ståldal AuthorDate: Wed Jul 26 21:45:49 2017 +0200 Bump version to 2.9-SNAPSHOT --- log4j-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/log4j-server/pom.xml b/log4j-server/pom.xml index 5e3c98d..29de565 100644 --- a/log4j-server/pom.xml +++ b/log4j-server/pom.xml @@ -20,7 +20,7 @@ org.apache.logging.log4j log4j-tools -2.8.3-SNAPSHOT +2.9-SNAPSHOT ../ log4j-server
(logging-log4j-samples) 07/34: Remove useless extra parens.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 9537e5ce5f43dc8bf927ce52200f0d730c88
Author: Gary Gregory
AuthorDate: Fri Jul 28 16:09:51 2017 -0700
Remove useless extra parens.
---
.../java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java| 2 +-
.../java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java | 2 +-
.../org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java | 2 +-
.../java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java| 2 +-
.../java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java | 2 +-
.../org/apache/logging/log4j/server/UdpSerializedSocketServerTest.java | 2 +-
.../java/org/apache/logging/log4j/server/UdpXmlSocketServerTest.java| 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
index 1a51244..1a4acb4 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/SslXmlSocketServerTest.java
@@ -70,7 +70,7 @@ public class SslXmlSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
initServerSocketFactory();
// Use a large buffer just to test the code, the UDP test uses a tiny
buffer
server = new SecureTcpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
index f12c908..63470dd 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpJsonSocketServerTest.java
@@ -31,7 +31,7 @@ public class TcpJsonSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
server = TcpSocketServer.createJsonSocketServer(PORT_NUM);
thread = server.startNewThread();
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
index 275af20..7b0a3c1 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpSerializedSocketServerTest.java
@@ -32,7 +32,7 @@ public class TcpSerializedSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
server = TcpSocketServer.createSerializedSocketServer(PORT_NUM);
thread = server.startNewThread();
}
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
index 2b2cfd7..6a0ad13 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/TcpXmlSocketServerTest.java
@@ -32,7 +32,7 @@ public class TcpXmlSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static void setupClass() throws Exception {
-(LoggerContext.getContext(false)).reconfigure();
+LoggerContext.getContext(false).reconfigure();
// Use a large buffer just to test the code, the UDP test uses a tiny
buffer
server = new TcpSocketServer<>(PORT_NUM, new
XmlInputStreamLogEventBridge(1024 * 100,
Charset.defaultCharset()));
diff --git
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
index 7bd36f9..e6b6d93 100644
---
a/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
+++
b/log4j-server/src/test/java/org/apache/logging/log4j/server/UdpJsonSocketServerTest.java
@@ -31,7 +31,7 @@ public class UdpJsonSocketServerTest extends
AbstractSocketServerTest {
@BeforeClass
public static
(logging-log4j-samples) 06/34: [LOG4J2-1994] TcpSocketServer does not close accepted Sockets.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit ac3e5118a3df2ae383022430d3009fc9540a38e1
Author: Gary Gregory
AuthorDate: Fri Jul 28 16:05:17 2017 -0700
[LOG4J2-1994] TcpSocketServer does not close accepted Sockets.
---
.../main/java/org/apache/logging/log4j/server/TcpSocketServer.java | 5 +
1 file changed, 5 insertions(+)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index 4d8146b..af458f8 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -71,10 +71,12 @@ public class TcpSocketServer extends
AbstractSocketServer
private class SocketHandler extends Log4jThread {
private final T inputStream;
+private final Socket socket;
private volatile boolean shutdown = false;
public SocketHandler(final Socket socket) throws IOException {
+this.socket = socket;
this.inputStream =
logEventInput.wrapStream(socket.getInputStream());
}
@@ -107,6 +109,9 @@ public class TcpSocketServer extends
AbstractSocketServer
public void shutdown() {
this.shutdown = true;
+if (socket != null) {
+Closer.closeSilently(socket);
+}
interrupt();
}
}
(logging-log4j-samples) 05/34: Match log4j-core 2.9-SNAPSHOT
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch merge-server
in repository https://gitbox.apache.org/repos/asf/logging-log4j-samples.git
commit 1d12a8400f1aab2a8e747824d4cae284335827e6
Author: Mikael Ståldal
AuthorDate: Wed Jul 26 22:17:09 2017 +0200
Match log4j-core 2.9-SNAPSHOT
---
.../log4j/server/InputStreamLogEventBridge.java | 19 +--
.../org/apache/logging/log4j/server/JmsServer.java| 5 +++--
.../log4j/server/JsonInputStreamLogEventBridge.java | 5 ++---
.../apache/logging/log4j/server/LogEventBridge.java | 5 ++---
.../apache/logging/log4j/server/TcpSocketServer.java | 3 +++
.../apache/logging/log4j/server/UdpSocketServer.java | 3 +++
.../log4j/server/XmlInputStreamLogEventBridge.java| 4 ++--
.../log4j/server/AbstractSocketServerTest.java| 13 ++---
.../log4j/server/UdpSerializedSocketServerTest.java | 2 --
9 files changed, 34 insertions(+), 25 deletions(-)
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
index 68ec791..90597c9 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/InputStreamLogEventBridge.java
@@ -22,12 +22,10 @@ import java.nio.charset.Charset;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.LogEventListener;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.core.parser.ParseException;
+import org.apache.logging.log4j.core.parser.TextLogEventParser;
import org.apache.logging.log4j.util.Strings;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectReader;
-
/**
* Reads and logs {@link LogEvent}s from an {@link InputStream}.
*/
@@ -39,19 +37,20 @@ public abstract class InputStreamLogEventBridge extends
AbstractLogEventBridge {
*the input stream to read
* @param logEventListener
*TODO
- * @throws IOException
*/
-void logEvents(T inputStream, LogEventListener logEventListener) throws
IOException;
+void logEvents(T inputStream, LogEventListener logEventListener) throws
IOException, ParseException;
/**
* Wraps the given stream if needed.
@@ -51,7 +51,6 @@ public interface LogEventBridge {
* @param inputStream
*the stream to wrap
* @return the wrapped stream or the given stream.
- * @throws IOException
*/
T wrapStream(InputStream inputStream) throws IOException;
}
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
index fb9d53b..4d8146b 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/TcpSocketServer.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentMap;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.validators.PositiveInteger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.parser.ParseException;
import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
import org.apache.logging.log4j.core.util.Closer;
import org.apache.logging.log4j.core.util.Log4jThread;
@@ -92,6 +93,8 @@ public class TcpSocketServer extends
AbstractSocketServer
logger.error("OptionalDataException eof=" + e.eof + "
length=" + e.length, e);
} catch (final IOException e) {
logger.error("IOException encountered while reading from
socket", e);
+} catch (ParseException e) {
+logger.error("ParseException encountered while reading
from socket", e);
}
if (!closed) {
Closer.closeSilently(inputStream);
diff --git
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
index 8259427..a19f217 100644
---
a/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
+++
b/log4j-server/src/main/java/org/apache/logging/log4j/server/UdpSocketServer.java
@@ -27,6 +27,7 @@ import java.net.DatagramSocket;
import java.util.List;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.parser.ParseException;
import org.apache.logging.log4j.core.util.BasicCommandLineArguments;
/**
@@ -169,6 +170,8 @@ public class UdpSocketServer extends
AbstractSocketServer
return;
}
