You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/02/24 08:02:04 UTC
[logging-log4j2] branch master updated (bf1b2f63d8 -> f43f995b27)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from bf1b2f63d8 Add `ppkarwasz`s GitHub Sponsors link
new 13847a6554 Remove samples from main repo
new f43f995b27 Remove managed dependencies: `guava` and `jna`
The 2 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-samples-configuration/.gitignore | 3 -
log4j-samples/log4j-samples-configuration/pom.xml | 49 -----
.../log4j/configuration/CustomConfiguration.java | 82 --------
.../configuration/CustomConfigurationFactory.java | 65 ------
.../configuration/CustomConfigurationTest.java | 33 ---
.../log4j-samples-flume-common/.gitignore | 4 -
log4j-samples/log4j-samples-flume-common/pom.xml | 69 -------
.../logging/log4j/samples/app/LogEventFactory.java | 104 ----------
.../logging/log4j/samples/app/LoggingApp.java | 143 -------------
.../log4j/samples/app/LoggingController.java | 141 -------------
.../log4j/samples/app/MockEventsSupplier.java | 98 ---------
.../logging/log4j/samples/dto/AuditEvent.java | 25 ---
.../logging/log4j/samples/dto/Constraint.java | 39 ----
.../logging/log4j/samples/dto/RequestContext.java | 172 ----------------
.../apache/logging/log4j/samples/events/Alert.java | 78 --------
.../log4j/samples/events/ChangePassword.java | 34 ----
.../apache/logging/log4j/samples/events/Login.java | 46 -----
.../log4j/samples/events/ScheduledTransaction.java | 128 ------------
.../logging/log4j/samples/events/Transfer.java | 172 ----------------
.../logging/log4j/samples/util/NamingUtils.java | 85 --------
.../log4j-samples-flume-embedded/.gitignore | 4 -
.../log4j-samples-flume-embedded/README.txt | 22 --
log4j-samples/log4j-samples-flume-embedded/pom.xml | 130 ------------
.../resources/flume/conf/flume-conf.properties | 50 -----
.../src/main/resources/log4j-embedded.xml | 49 -----
.../src/main/webapp/WEB-INF/applicationContext.xml | 39 ----
.../src/main/webapp/WEB-INF/rest-servlet.xml | 36 ----
.../src/main/webapp/WEB-INF/web.xml | 61 ------
.../src/main/webapp/start.jsp | 30 ---
.../src/main/webapp/stop.jsp | 28 ---
.../log4j-samples-flume-remote/.gitignore | 4 -
.../log4j-samples-flume-remote/README.txt | 26 ---
log4j-samples/log4j-samples-flume-remote/pom.xml | 111 -----------
.../resources/flume/conf/flume-conf.properties | 50 -----
.../src/main/resources/log4j-remote.xml | 49 -----
.../src/main/webapp/WEB-INF/applicationContext.xml | 39 ----
.../src/main/webapp/WEB-INF/rest-servlet.xml | 36 ----
.../src/main/webapp/WEB-INF/web.xml | 61 ------
.../src/main/webapp/start.jsp | 30 ---
.../src/main/webapp/stop.jsp | 28 ---
.../log4j-samples-loggerProperties/.gitignore | 3 -
.../log4j-samples-loggerProperties/pom.xml | 48 -----
.../apache/logging/log4j/lookup/CustomLookup.java | 82 --------
.../logging/log4j/lookup/CustomMapMessage.java | 53 -----
.../logging/log4j/lookup/MapMessageLookup.java | 75 -------
.../apache/logging/log4j/CustomPropertiesTest.java | 51 -----
.../apache/logging/log4j/MapMessageLookupTest.java | 89 ---------
.../src/test/resources/log4j2.xml | 48 -----
log4j-samples/pom.xml | 104 ----------
.../Dockerfile | 33 ---
.../README.md | 55 -----
.../docker/app-compose.yml | 21 --
.../docker/combined-compose.yml | 86 --------
.../docker/docker-compose.yml | 74 -------
.../docker/down.sh | 19 --
.../docker/init/fluent-bit/fluent-bit.conf | 28 ---
.../docker/init/flume/flume-env.sh | 15 --
.../docker/init/flume/flume.conf | 46 -----
.../docker/init/flume/log4j.properties | 23 ---
.../docker/init/flume/start-flume.sh | 28 ---
.../docker/init/rabbit/definitions.json | 36 ----
.../docker/init/rabbit/rabbitmq.config | 14 --
.../docker/logs.sh | 21 --
.../docker/restartApp.sh | 35 ----
.../docker/stop.sh | 20 --
.../docker/stopApp.sh | 17 --
.../docker/up.sh | 20 --
.../k8s/deploy.sh | 36 ----
.../k8s/sampleapp-deployment.yaml | 53 -----
.../k8s/undeploy.sh | 29 ---
.../pom.xml | 222 ---------------------
.../cloud/config/sample/SampleApplication.java | 29 ---
.../sample/config/GlobalExceptionHandler.java | 36 ----
.../cloud/config/sample/config/WebMvcConfig.java | 39 ----
.../config/sample/controller/K8SController.java | 82 --------
.../config/sample/controller/SampleController.java | 125 ------------
.../utils/spring/SampleResponseErrorHandler.java | 36 ----
.../src/main/resources/EnhancedGelf.json | 40 ----
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../src/main/resources/application.yml | 33 ---
.../src/main/resources/bootstrap.yml | 5 -
.../src/main/resources/log4j2.component.properties | 17 --
.../pom.xml | 165 ---------------
.../readme.txt | 0
.../src/main/config-repo/log4j2.xml | 176 ----------------
.../config/service/ConfigServiceApplication.java | 29 ---
.../service/config/SecurityConfiguration.java | 37 ----
.../src/main/resources/application.yaml | 38 ----
.../src/main/resources/log4j2.xml | 29 ---
.../service/ConfigServiceApplicationTest.java | 32 ---
.../log4j-spring-cloud-config-samples/pom.xml | 93 ---------
log4j-spring-cloud-config/pom.xml | 1 -
pom.xml | 14 --
93 files changed, 4993 deletions(-)
delete mode 100644 log4j-samples/log4j-samples-configuration/.gitignore
delete mode 100644 log4j-samples/log4j-samples-configuration/pom.xml
delete mode 100644 log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
delete mode 100644 log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java
delete mode 100644 log4j-samples/log4j-samples-configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java
delete mode 100644 log4j-samples/log4j-samples-flume-common/.gitignore
delete mode 100644 log4j-samples/log4j-samples-flume-common/pom.xml
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
delete mode 100644 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/AuditEvent.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
delete mode 100644 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java
delete mode 100755 log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java
delete mode 100644 log4j-samples/log4j-samples-flume-embedded/.gitignore
delete mode 100644 log4j-samples/log4j-samples-flume-embedded/README.txt
delete mode 100644 log4j-samples/log4j-samples-flume-embedded/pom.xml
delete mode 100644 log4j-samples/log4j-samples-flume-embedded/src/main/resources/flume/conf/flume-conf.properties
delete mode 100755 log4j-samples/log4j-samples-flume-embedded/src/main/resources/log4j-embedded.xml
delete mode 100755 log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/applicationContext.xml
delete mode 100755 log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/rest-servlet.xml
delete mode 100755 log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/web.xml
delete mode 100644 log4j-samples/log4j-samples-flume-embedded/src/main/webapp/start.jsp
delete mode 100644 log4j-samples/log4j-samples-flume-embedded/src/main/webapp/stop.jsp
delete mode 100644 log4j-samples/log4j-samples-flume-remote/.gitignore
delete mode 100644 log4j-samples/log4j-samples-flume-remote/README.txt
delete mode 100644 log4j-samples/log4j-samples-flume-remote/pom.xml
delete mode 100644 log4j-samples/log4j-samples-flume-remote/src/main/resources/flume/conf/flume-conf.properties
delete mode 100755 log4j-samples/log4j-samples-flume-remote/src/main/resources/log4j-remote.xml
delete mode 100755 log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/applicationContext.xml
delete mode 100755 log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/rest-servlet.xml
delete mode 100755 log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/web.xml
delete mode 100644 log4j-samples/log4j-samples-flume-remote/src/main/webapp/start.jsp
delete mode 100644 log4j-samples/log4j-samples-flume-remote/src/main/webapp/stop.jsp
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/.gitignore
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/pom.xml
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java
delete mode 100644 log4j-samples/log4j-samples-loggerProperties/src/test/resources/log4j2.xml
delete mode 100644 log4j-samples/pom.xml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/Dockerfile
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/app-compose.yml
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/combined-compose.yml
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/docker-compose.yml
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/down.sh
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/fluent-bit/fluent-bit.conf
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume-env.sh
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume.conf
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/log4j.properties
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/start-flume.sh
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/definitions.json
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/rabbitmq.config
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/logs.sh
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/restartApp.sh
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stop.sh
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stopApp.sh
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/up.sh
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/deploy.sh
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/sampleapp-deployment.yaml
delete mode 100755 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/undeploy.sh
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/EnhancedGelf.json
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/META-INF/MANIFEST.MF
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/application.yml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/bootstrap.yml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/log4j2.component.properties
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/readme.txt
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplication.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/application.yaml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/log4j2.xml
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java
delete mode 100644 log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
[logging-log4j2] 01/02: Remove samples from main repo
Posted by pk...@apache.org.
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-log4j2.git
commit 13847a6554c884d94bc5f1da36a87eab0d2620a6
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Sat Feb 18 00:43:48 2023 +0100
Remove samples from main repo
The samples were moved to:
https://github.com/apache/logging-log4j-samples
---
.../log4j-samples-configuration/.gitignore | 3 -
log4j-samples/log4j-samples-configuration/pom.xml | 49 -----
.../log4j/configuration/CustomConfiguration.java | 82 --------
.../configuration/CustomConfigurationFactory.java | 65 ------
.../configuration/CustomConfigurationTest.java | 33 ---
.../log4j-samples-flume-common/.gitignore | 4 -
log4j-samples/log4j-samples-flume-common/pom.xml | 69 -------
.../logging/log4j/samples/app/LogEventFactory.java | 104 ----------
.../logging/log4j/samples/app/LoggingApp.java | 143 -------------
.../log4j/samples/app/LoggingController.java | 141 -------------
.../log4j/samples/app/MockEventsSupplier.java | 98 ---------
.../logging/log4j/samples/dto/AuditEvent.java | 25 ---
.../logging/log4j/samples/dto/Constraint.java | 39 ----
.../logging/log4j/samples/dto/RequestContext.java | 172 ----------------
.../apache/logging/log4j/samples/events/Alert.java | 78 --------
.../log4j/samples/events/ChangePassword.java | 34 ----
.../apache/logging/log4j/samples/events/Login.java | 46 -----
.../log4j/samples/events/ScheduledTransaction.java | 128 ------------
.../logging/log4j/samples/events/Transfer.java | 172 ----------------
.../logging/log4j/samples/util/NamingUtils.java | 85 --------
.../log4j-samples-flume-embedded/.gitignore | 4 -
.../log4j-samples-flume-embedded/README.txt | 22 --
log4j-samples/log4j-samples-flume-embedded/pom.xml | 130 ------------
.../resources/flume/conf/flume-conf.properties | 50 -----
.../src/main/resources/log4j-embedded.xml | 49 -----
.../src/main/webapp/WEB-INF/applicationContext.xml | 39 ----
.../src/main/webapp/WEB-INF/rest-servlet.xml | 36 ----
.../src/main/webapp/WEB-INF/web.xml | 61 ------
.../src/main/webapp/start.jsp | 30 ---
.../src/main/webapp/stop.jsp | 28 ---
.../log4j-samples-flume-remote/.gitignore | 4 -
.../log4j-samples-flume-remote/README.txt | 26 ---
log4j-samples/log4j-samples-flume-remote/pom.xml | 111 -----------
.../resources/flume/conf/flume-conf.properties | 50 -----
.../src/main/resources/log4j-remote.xml | 49 -----
.../src/main/webapp/WEB-INF/applicationContext.xml | 39 ----
.../src/main/webapp/WEB-INF/rest-servlet.xml | 36 ----
.../src/main/webapp/WEB-INF/web.xml | 61 ------
.../src/main/webapp/start.jsp | 30 ---
.../src/main/webapp/stop.jsp | 28 ---
.../log4j-samples-loggerProperties/.gitignore | 3 -
.../log4j-samples-loggerProperties/pom.xml | 48 -----
.../apache/logging/log4j/lookup/CustomLookup.java | 82 --------
.../logging/log4j/lookup/CustomMapMessage.java | 53 -----
.../logging/log4j/lookup/MapMessageLookup.java | 75 -------
.../apache/logging/log4j/CustomPropertiesTest.java | 51 -----
.../apache/logging/log4j/MapMessageLookupTest.java | 89 ---------
.../src/test/resources/log4j2.xml | 48 -----
log4j-samples/pom.xml | 104 ----------
.../Dockerfile | 33 ---
.../README.md | 55 -----
.../docker/app-compose.yml | 21 --
.../docker/combined-compose.yml | 86 --------
.../docker/docker-compose.yml | 74 -------
.../docker/down.sh | 19 --
.../docker/init/fluent-bit/fluent-bit.conf | 28 ---
.../docker/init/flume/flume-env.sh | 15 --
.../docker/init/flume/flume.conf | 46 -----
.../docker/init/flume/log4j.properties | 23 ---
.../docker/init/flume/start-flume.sh | 28 ---
.../docker/init/rabbit/definitions.json | 36 ----
.../docker/init/rabbit/rabbitmq.config | 14 --
.../docker/logs.sh | 21 --
.../docker/restartApp.sh | 35 ----
.../docker/stop.sh | 20 --
.../docker/stopApp.sh | 17 --
.../docker/up.sh | 20 --
.../k8s/deploy.sh | 36 ----
.../k8s/sampleapp-deployment.yaml | 53 -----
.../k8s/undeploy.sh | 29 ---
.../pom.xml | 222 ---------------------
.../cloud/config/sample/SampleApplication.java | 29 ---
.../sample/config/GlobalExceptionHandler.java | 36 ----
.../cloud/config/sample/config/WebMvcConfig.java | 39 ----
.../config/sample/controller/K8SController.java | 82 --------
.../config/sample/controller/SampleController.java | 125 ------------
.../utils/spring/SampleResponseErrorHandler.java | 36 ----
.../src/main/resources/EnhancedGelf.json | 40 ----
.../src/main/resources/META-INF/MANIFEST.MF | 0
.../src/main/resources/application.yml | 33 ---
.../src/main/resources/bootstrap.yml | 5 -
.../src/main/resources/log4j2.component.properties | 17 --
.../pom.xml | 165 ---------------
.../readme.txt | 0
.../src/main/config-repo/log4j2.xml | 176 ----------------
.../config/service/ConfigServiceApplication.java | 29 ---
.../service/config/SecurityConfiguration.java | 37 ----
.../src/main/resources/application.yaml | 38 ----
.../src/main/resources/log4j2.xml | 29 ---
.../service/ConfigServiceApplicationTest.java | 32 ---
.../log4j-spring-cloud-config-samples/pom.xml | 93 ---------
log4j-spring-cloud-config/pom.xml | 1 -
pom.xml | 1 -
93 files changed, 4980 deletions(-)
diff --git a/log4j-samples/log4j-samples-configuration/.gitignore b/log4j-samples/log4j-samples-configuration/.gitignore
deleted file mode 100644
index ddd6d6d330..0000000000
--- a/log4j-samples/log4j-samples-configuration/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.settings/
-/.classpath
-/.project
diff --git a/log4j-samples/log4j-samples-configuration/pom.xml b/log4j-samples/log4j-samples-configuration/pom.xml
deleted file mode 100644
index 9c6d4c8358..0000000000
--- a/log4j-samples/log4j-samples-configuration/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>log4j-samples</artifactId>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>log4j-samples-configuration</artifactId>
- <packaging>jar</packaging>
- <name>Apache Log4j Samples: Configuration</name>
- <url>http://maven.apache.org</url>
- <properties>
- <log4jParentDir>${basedir}/../..</log4jParentDir>
- <module.name>org.apache.logging.log4j.samples.configuration</module.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java b/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
deleted file mode 100644
index b4a2e41b2d..0000000000
--- a/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
+++ /dev/null
@@ -1,82 +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.configuration;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.appender.ConsoleAppender;
-import org.apache.logging.log4j.core.config.AbstractConfiguration;
-import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.apache.logging.log4j.util.PropertiesUtil;
-
-/**
- * This Configuration is the same as the DefaultConfiguration but shows how a custom configuration can be built
- * programmatically
- */
-public class CustomConfiguration extends AbstractConfiguration {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * The name of the default configuration.
- */
- public static final String CONFIG_NAME = "Custom";
-
- /**
- * The System Property used to specify the logging level.
- */
- public static final String DEFAULT_LEVEL = "org.apache.logging.log4j.level";
- /**
- * The default Pattern used for the default Layout.
- */
- public static final String DEFAULT_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
-
- public CustomConfiguration(final LoggerContext loggerContext) {
- this(loggerContext, ConfigurationSource.NULL_SOURCE);
- }
-
- /**
- * Constructor to create the default configuration.
- */
- public CustomConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
- super(loggerContext, source);
-
- setName(CONFIG_NAME);
- final Layout layout = PatternLayout.newBuilder()
- .setPattern(DEFAULT_PATTERN)
- .setConfiguration(this)
- .build();
- final Appender appender = ConsoleAppender.createDefaultAppenderForLayout(layout);
- appender.start();
- addAppender(appender);
- final LoggerConfig root = getRootLogger();
- root.addAppender(appender, null, null);
-
- final String levelName = PropertiesUtil.getProperties().getStringProperty(DEFAULT_LEVEL);
- final Level level = levelName != null && Level.valueOf(levelName) != null ?
- Level.valueOf(levelName) : Level.ERROR;
- root.setLevel(level);
- }
-
- @Override
- protected void doConfigure() {
- }
-}
diff --git a/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java b/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java
deleted file mode 100644
index 47973e0720..0000000000
--- a/log4j-samples/log4j-samples-configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java
+++ /dev/null
@@ -1,65 +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.configuration;
-
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.ConfigurationFactory;
-import org.apache.logging.log4j.core.config.ConfigurationSource;
-import org.apache.logging.log4j.core.config.Order;
-import org.apache.logging.log4j.plugins.Namespace;
-import org.apache.logging.log4j.plugins.Plugin;
-
-import java.net.URI;
-
-/**
- * Factory to construct a CustomConfiguration.
- */
-@Namespace(ConfigurationFactory.NAMESPACE)
-@Plugin("CustomConfigurationFactory")
-@Order(50)
-public class CustomConfigurationFactory extends ConfigurationFactory {
-
- /**
- * Valid file extensions for XML files.
- */
- public static final String[] SUFFIXES = new String[] {"*"};
-
- /**
- * Returns the Configuration.
- * @param source The InputSource.
- * @return The Configuration.
- */
- @Override
- public Configuration getConfiguration(final LoggerContext loggerContext, final ConfigurationSource source) {
- return new CustomConfiguration(loggerContext, source);
- }
-
- @Override
- public Configuration getConfiguration(final LoggerContext loggerContext, final String name, final URI configLocation) {
- return new CustomConfiguration(loggerContext);
- }
-
- /**
- * Returns the file suffixes for XML files.
- * @return An array of File extensions.
- */
- @Override
- public String[] getSupportedTypes() {
- return SUFFIXES;
- }
-}
diff --git a/log4j-samples/log4j-samples-configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java b/log4j-samples/log4j-samples-configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java
deleted file mode 100644
index 054a0f30e4..0000000000
--- a/log4j-samples/log4j-samples-configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java
+++ /dev/null
@@ -1,33 +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.configuration;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.junit.Test;
-
-/**
- *
- */
-public class CustomConfigurationTest {
- private final Logger logger = LogManager.getLogger(CustomConfiguration.class);
-
- @Test
- public void testLogging() {
- logger.error("This is a test");
- }
-}
diff --git a/log4j-samples/log4j-samples-flume-common/.gitignore b/log4j-samples/log4j-samples-flume-common/.gitignore
deleted file mode 100644
index 9f0fc218e1..0000000000
--- a/log4j-samples/log4j-samples-flume-common/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
diff --git a/log4j-samples/log4j-samples-flume-common/pom.xml b/log4j-samples/log4j-samples-flume-common/pom.xml
deleted file mode 100644
index 97280f7ba7..0000000000
--- a/log4j-samples/log4j-samples-flume-common/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>log4j-samples</artifactId>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>log4j-samples-flume-common</artifactId>
- <packaging>jar</packaging>
- <name>Apache Log4j Samples: Flume - Common</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <log4jParentDir>../..</log4jParentDir>
- <module.name>org.apache.logging.log4j.samples.flume.common</module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
deleted file mode 100755
index cc17609e1d..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LogEventFactory.java
+++ /dev/null
@@ -1,104 +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.samples.app;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-
-import org.apache.logging.log4j.EventLogger;
-import org.apache.logging.log4j.message.StructuredDataMessage;
-import org.apache.logging.log4j.samples.dto.AuditEvent;
-import org.apache.logging.log4j.samples.dto.Constraint;
-import org.apache.logging.log4j.samples.util.NamingUtils;
-
-/**
- *
- */
-public class LogEventFactory {
-
- @SuppressWarnings("unchecked")
- public static <T extends AuditEvent> T getEvent(final Class<T> intrface) {
-
- final String eventId = NamingUtils.lowerFirst(intrface.getSimpleName());
- final StructuredDataMessage msg = new StructuredDataMessage(eventId, null, "Audit");
- return (T)Proxy.newProxyInstance(intrface
- .getClassLoader(), new Class<?>[]{intrface}, new AuditProxy(msg, intrface));
- }
-
- private static class AuditProxy implements InvocationHandler {
-
- private final StructuredDataMessage msg;
- private final Class<?> intrface;
-
- public AuditProxy(final StructuredDataMessage msg, final Class<?> intrface) {
- this.msg = msg;
- this.intrface = intrface;
- }
-
- @Override
- public Object invoke(final Object o, final Method method, final Object[] objects)
- throws Throwable {
- if (method.getName().equals("logEvent")) {
-
- final StringBuilder missing = new StringBuilder();
-
- final Method[] methods = intrface.getMethods();
-
- for (final Method _method : methods) {
- final String name = NamingUtils.lowerFirst(NamingUtils
- .getMethodShortName(_method.getName()));
-
- final Annotation[] annotations = _method.getDeclaredAnnotations();
- for (final Annotation annotation : annotations) {
- final Constraint constraint = (Constraint) annotation;
-
- if (constraint.required() && msg.get(name) == null) {
- if (missing.length() > 0) {
- missing.append(", ");
- }
- missing.append(name);
- }
- }
- }
-
- if (missing.length() > 0) {
- throw new IllegalStateException("Event " + msg.getId().getName() +
- " is missing required attributes " + missing);
- }
- EventLogger.logEvent(msg);
- }
- if (method.getName().equals("setCompletionStatus")) {
- final String name = NamingUtils.lowerFirst(NamingUtils.getMethodShortName(method.getName()));
- msg.put(name, objects[0].toString());
- }
- if (method.getName().startsWith("set")) {
- final String name = NamingUtils.lowerFirst(NamingUtils.getMethodShortName(method.getName()));
-
- /*
- * Perform any validation here. Currently the catalog doesn't
- * contain any information on validation rules.
- */
- msg.put(name, objects[0].toString());
- }
-
- return null;
- }
-
- }
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
deleted file mode 100644
index 944082f3e8..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
+++ /dev/null
@@ -1,143 +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.samples.app;
-
-import java.util.List;
-import java.util.Random;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.samples.dto.AuditEvent;
-import org.apache.logging.log4j.samples.dto.RequestContext;
-
-
-/**
- * The Class LoggingApp.
- */
-public class LoggingApp {
-
- /**
- * The logger.
- */
- private static Logger logger = LogManager.getLogger(LoggingApp.class);
-
- private final Random ran = new Random();
-
- private List<AuditEvent> events;
-
- public static void main(final String[] args) {
- String member = "fakemember";
- if (args.length == 1) {
- member = args[0];
- }
- final LoggingApp app = new LoggingApp(member);
- app.runApp(member);
- System.out.println("Job ended");
- }
-
- public LoggingApp(final String member) {
-
- ThreadContext.clearMap();
-
- RequestContext.setSessionId("session1234");
- RequestContext.setIpAddress("127.0.0.1");
- RequestContext.setClientId("02121");
- RequestContext.setProductName("IB");
- RequestContext.setProductVersion("4.18.1");
- RequestContext.setLocale("en_US");
- RequestContext.setRegion("prod");
-
- if (events == null) {
- events = MockEventsSupplier.getAllEvents(member);
- }
- }
-
- public void runApp(final String member) {
- final Worker worker = new Worker(member);
- worker.start();
- sleep(30000);
- worker.shutdown();
- sleep(5000);
- }
-
- private void sleep(final long millis) {
- try {
- Thread.sleep(millis);
- } catch (final InterruptedException ie) {
- //
- }
- }
-
-
- public class Worker extends Thread {
-
- private final String member;
-
- private boolean shutdown = false;
-
- public Worker(final String member) {
- this.member = member;
- }
-
- @Override
- public void run() {
- System.out.println("STARTING..................");
-
- while (!shutdown) {
- // Generate rand number between 1 to 10
- final int rand = ran.nextInt(9) + 1;
-
- // Sleep for rand seconds
- try {
- Thread.sleep(rand * 1000);
- } catch (final InterruptedException e) {
- logger.warn("WARN", e);
- }
-
- // Write rand number of logs
- for (int i = 0; i < rand; i++) {
- final int eventIndex = (Math.abs(ran.nextInt())) % events.size();
- final AuditEvent event = events.get(eventIndex);
- RequestContext.setUserId(member);
- event.logEvent();
-
- if ((rand % 4) == 1) {
- logger.debug("DEBUG level logging.....");
- } else if ((rand % 4) == 2) {
- logger.info("INFO level logging.....");
- } else if ((rand % 4) == 3) {
- logger.warn("WARN level logging.....");
- } else {
- logger.error("ERROR level logging.....");
- }
- }
-
- }
- }
-
- public void shutdown() {
- this.shutdown = true;
- try {
- this.join();
- } catch (final InterruptedException ie) {
- //
- }
- System.out.println("SHUTDOWN.......................");
- }
- }
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
deleted file mode 100755
index 02d47b32cb..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
+++ /dev/null
@@ -1,141 +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.samples.app;
-
-import java.util.List;
-import java.util.Random;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.samples.dto.AuditEvent;
-import org.apache.logging.log4j.samples.dto.RequestContext;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
-
-
-/**
- * The Class LoggingController.
- */
-@Controller
-public class LoggingController {
-
- /**
- * The logger.
- */
- private static Logger logger = LogManager.getLogger(LoggingController.class);
-
- private volatile boolean generateLog;
- private final Random ran = new Random();
-
- private List<AuditEvent> events;
- private int timeBase = 1000;
-
- @RequestMapping(value = "/start.do", method = RequestMethod.GET)
- public ModelAndView startLogging(
- @RequestParam(value = "member", required = false, defaultValue = "fakemember") final String member,
- @RequestParam(value = "interval", required = false, defaultValue = "1000") final String interval,
- @RequestParam(value = "threads", required = false, defaultValue = "1") final String threadCount,
- final HttpServletRequest servletRequest) {
- int numThreads = 1;
- if (Strings.isNotEmpty(threadCount)) {
- try {
- numThreads = Integer.parseInt(threadCount);
- } catch (final Exception ex) {
- System.out.println("Invalid threadCount specified: " + threadCount);
- }
- }
- if (Strings.isNotEmpty(interval)) {
- try {
- timeBase = Integer.parseInt(interval);
- } catch (final Exception ex) {
- System.out.println("Invalid interval specified: " + interval);
- }
- }
- System.out.println("STARTING - Using " + numThreads + " threads at interval: " + timeBase);
-
- if (events == null) {
- events = MockEventsSupplier.getAllEvents(member);
- }
-
- generateLog = true;
-
- for (int i = 0; i < numThreads; ++i) {
- (new Thread() {
-
- @Override
- public void run() {
- ThreadContext.clearMap();
-
- RequestContext.setSessionId("session1234");
- RequestContext.setIpAddress("127.0.0.1");
- RequestContext.setClientId("02121");
- RequestContext.setProductName("IB");
- RequestContext.setProductVersion("4.18.1");
- RequestContext.setLocale("en_US");
- RequestContext.setRegion("prod");
- while (generateLog) {
- // Generate rand number between 1 to 10
- final int rand = ran.nextInt(9) + 1;
-
- // Sleep for rand seconds
- try {
- Thread.sleep(rand * timeBase);
- } catch (final InterruptedException e) {
- logger.warn("WARN", e);
- }
-
- // Write rand number of logs
- for (int i = 0; i < rand; i++) {
- final int eventIndex = (Math.abs(ran.nextInt())) % events.size();
- final AuditEvent event = events.get(eventIndex);
- RequestContext.setUserId(member);
- event.logEvent();
-
- if ((rand % 4) == 1) {
- logger.debug("DEBUG level logging.....");
- } else if ((rand % 4) == 2) {
- logger.info("INFO level logging.....");
- } else if ((rand % 4) == 3) {
- logger.warn("WARN level logging.....");
- } else {
- logger.error("ERROR level logging.....");
- }
- }
-
- }
- ThreadContext.cloneStack();
- }
- }).start();
- }
-
- return new ModelAndView("start.jsp");
- }
-
- @RequestMapping(value = "/stop.do", method = RequestMethod.GET)
- public ModelAndView stopLogging(final HttpServletRequest servletRequest) {
- generateLog = false;
- return new ModelAndView("stop.jsp");
- }
-
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
deleted file mode 100755
index bdd64b46d5..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/app/MockEventsSupplier.java
+++ /dev/null
@@ -1,98 +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.samples.app;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import org.apache.logging.log4j.samples.dto.AuditEvent;
-import org.apache.logging.log4j.samples.events.Alert;
-import org.apache.logging.log4j.samples.events.ChangePassword;
-import org.apache.logging.log4j.samples.events.Login;
-import org.apache.logging.log4j.samples.events.ScheduledTransaction;
-import org.apache.logging.log4j.samples.events.Transfer;
-
-public class MockEventsSupplier {
-
- /* This provides random generation */
- static Random random = new Random();
-
- public static List<AuditEvent> getAllEvents(final String member) {
-
- final List<AuditEvent> events = new ArrayList<>();
-
-
- final Login login = LogEventFactory.getEvent(Login.class);
- login.setStartPageOption("account summary");
- login.setSource("online");
- login.setMember(member);
- events.add(login);
-
- final ChangePassword changePassword = LogEventFactory.getEvent(ChangePassword.class);
- changePassword.setMember(member);
- events.add(changePassword);
-
- final Transfer transfer = LogEventFactory.getEvent(Transfer.class);
-
- transfer.setAmount("4251");
- transfer.setFromAccount("REPLACE"); // getAccount(mbr, accounts));
- transfer.setToAccount("31142553");
- transfer.setReference("DI-2415220110804");
- transfer.setComment("My Transfer");
- transfer.setMemo("For dinner");
- transfer.setPayment("Use Checking");
- transfer.setTransactionType("1");
- transfer.setSource("IB Transfer page");
- transfer.setCompletionStatus("complete");
- transfer.setMember(member);
- events.add(transfer);
-
- final Alert alert = LogEventFactory.getEvent(Alert.class);
-
- alert.setAction("add");
- alert.setType("balance alert");
- alert.setAccountNumber("REPLACE"); // , getAccount(mbr, accounts));
- alert.setTrigger("GT");
- alert.setThreshold("1000");
- alert.setMember(member);
- events.add(alert);
-
- final ScheduledTransaction scheduledTransaction = LogEventFactory
- .getEvent(ScheduledTransaction.class);
-
- scheduledTransaction.setAction("add");
- scheduledTransaction.setFromAccount("REPLACE"); // getAccount(mbr,
- // accounts));
- scheduledTransaction.setToAccount("REPLACE"); // "9200000214");
- scheduledTransaction.setAmount("2541");
- scheduledTransaction.setStartDate("20110105");
- scheduledTransaction.setMember("256");
- scheduledTransaction.setFrequency("4");
- scheduledTransaction.setMemo("Scheduled Transfer");
- scheduledTransaction.setPayment("3456");
- scheduledTransaction.setCompletionNotification("Was completed");
- scheduledTransaction.setEndDate("2020-05-30");
- scheduledTransaction.setSrtId("Calabasas2341");
- scheduledTransaction.setSource("Home Page");
- scheduledTransaction.setCompletionStatus("success");
- scheduledTransaction.setMember(member);
- events.add(scheduledTransaction);
-
- return events;
- }
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/AuditEvent.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/AuditEvent.java
deleted file mode 100755
index 67694e6c28..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/AuditEvent.java
+++ /dev/null
@@ -1,25 +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.samples.dto;
-
-/**
- * Interface that indicates the Class was generated by the DTOManager.
- */
-public interface AuditEvent {
-
- void logEvent();
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
deleted file mode 100755
index c0e83cf772..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/Constraint.java
+++ /dev/null
@@ -1,39 +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.samples.dto;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.apache.logging.log4j.util.Strings;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Constraint {
-
- boolean required() default false;
-
- String pattern() default Strings.EMPTY;
-
- int minLength() default -1;
-
- int maxLength() default -1;
-
- int totalDigits() default -1;
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
deleted file mode 100644
index f7b6fc59e7..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
+++ /dev/null
@@ -1,172 +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.samples.dto;
-
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.util.UuidUtil;
-
-/**
- *
- */
-public final class RequestContext {
-
- private RequestContext() {
- }
- // Unique token to identify this request.
- public static final String REQUEST_ID = "id";
- // Token used to correlate multiple events within the request.
- public static final String TRANSACTION_ID = "transId";
- // The requested resource.
- public static final String REQUEST_URI = "requestURI";
- // Identify the user's session - should never contain the HTTP SessionId.
- public static final String SESSION_ID = "sessionId";
- // The id the user logged in with.
- public static final String LOGIN_ID = "loginId";
- // The id the system associates with the user.
- public static final String USER_ID = "userId";
- // user, admin, etc.
- public static final String USER_TYPE = "userType";
- // client id in a multi-tenant application
- public static final String CLIENT_ID = "clientId";
- // The user's ipAddress.
- public static final String IP_ADDRESS = "ipAddress";
- // The name of the product.
- public static final String PRODUCT_NAME = "productName";
- // The product version.
- public static final String PRODUCT_VERSION = "productVersion";
- // The users locale.
- public static final String LOCALE = "locale";
- // prod, preprod, beta, dev, etc.
- public static final String REGION = "region";
- // The user agent string from the browser.
- public static final String USER_AGENT = "userAgent";
-
- public static void initialize() {
- ThreadContext.clearMap();
- ThreadContext.put(REQUEST_ID, UuidUtil.getTimeBasedUuid().toString());
- }
-
- public static String getId() {
- return ThreadContext.get(REQUEST_ID);
- }
-
- public static void setSessionId(final String id) {
- ThreadContext.put(SESSION_ID, id);
- }
-
- public static String getSessionId() {
- return ThreadContext.get(SESSION_ID);
- }
-
- public static void setTransId(final String id) {
- ThreadContext.put(TRANSACTION_ID, id);
- }
-
- public static String getTransId() {
- return ThreadContext.get(TRANSACTION_ID);
- }
-
- public static void setRequestURI(final String URI) {
- ThreadContext.put(REQUEST_URI, URI);
- }
-
- public static String getRequestURI() {
- return ThreadContext.get(REQUEST_URI);
- }
-
- public static void setLoginId(final String id) {
- ThreadContext.put(LOGIN_ID, id);
- }
-
- public static String getLoginId() {
- return ThreadContext.get(LOGIN_ID);
- }
-
- public static void setUserId(final String id) {
- ThreadContext.put(USER_ID, id);
- }
-
- public static String getUserId() {
- return ThreadContext.get(USER_ID);
- }
-
- public static void setUserType(final String type) {
- ThreadContext.put(USER_TYPE, type);
- }
-
- public static String getUserType() {
- return ThreadContext.get(USER_TYPE);
- }
-
- public static void setClientId(final String id) {
- ThreadContext.put(CLIENT_ID, id);
- }
-
- public static String getClientId() {
- return ThreadContext.get(CLIENT_ID);
- }
-
- public static void setIpAddress(final String addr) {
- ThreadContext.put(IP_ADDRESS, addr);
- }
-
- public static String getIpAddress() {
- return ThreadContext.get(IP_ADDRESS);
- }
-
- public static void setProductName(final String productName) {
- ThreadContext.put(PRODUCT_NAME, productName);
- }
-
- public static String getProductName() {
- return ThreadContext.get(PRODUCT_NAME);
- }
-
-
- public static void setProductVersion(final String productVersion) {
- ThreadContext.put(PRODUCT_VERSION, productVersion);
- }
-
- public static String getProductVersion() {
- return ThreadContext.get(PRODUCT_VERSION);
- }
-
- public static void setLocale(final String locale) {
- ThreadContext.put(LOCALE, locale);
- }
-
- public static String getLocale() {
- return ThreadContext.get(LOCALE);
- }
-
- public static void setRegion(final String region) {
- ThreadContext.put(REGION, region);
- }
-
- public static String getRegion() {
- return ThreadContext.get(REGION);
- }
-
- public static void setUserAgent(final String agent) {
- ThreadContext.put(USER_AGENT, agent);
- }
-
- public static String getUserAgent() {
- return ThreadContext.get(USER_AGENT);
- }
-
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java
deleted file mode 100755
index 12a3c48a7e..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Alert.java
+++ /dev/null
@@ -1,78 +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.samples.events;
-
-import org.apache.logging.log4j.samples.dto.Constraint;
-
-/**
- * The user sets up account balance alerts.
- */
-
-public interface Alert extends org.apache.logging.log4j.samples.dto.AuditEvent {
-
- /**
- * Account Number : Account number
- *
- * @param accountNumber Account number
- */
- @Constraint(required = true)
- void setAccountNumber(String accountNumber);
-
- /**
- * Action : Indicates the step of the registration process. Valid actions are: Begin, Submit, Enroll Cancel, Confirm Page, Rt In Process Attempt, Reg submitted, acct del, Account del submit, account auto-Select, Duplicate user. Alternatively, the action the user has executed in the event
- *
- * @param action Indicates the step of the registration process. Valid actions are: Begin, Submit, Enroll Cancel, Confirm Page, Rt In Process Attempt, Reg submitted, acct del, Account del submit, account auto-Select, Duplicate user. Alternatively, the action the user has executed in the event
- */
- void setAction(String action);
-
- /**
- * Completion Status : Whether the event succeeded or failed - success/failure and optional reason.
- *
- * @param completionStatus Whether the event succeeded or failed - success/failure and optional reason.
- */
- void setCompletionStatus(String completionStatus);
-
- /**
- * Member : Member or End User number at the Host
- *
- * @param member Member or End User number at the Host
- */
- @Constraint(required = true)
- void setMember(String member);
-
- /**
- * Threshold : Balance alert, the amount to compare against the balance in the case of a balance alert. Check cleared alert, there is no value. for maturity date alert, there is no value. Loan payment due alert, there is no value. Loan payment past due alert, there is no value. Personal reminder and periodic balance alerts, this date is the Start Date that the alert will begin to be sent on.
- *
- * @param threshold Balance alert, the amount to compare against the balance in the case of a balance alert. Check cleared alert, there is no value. for maturity date alert, there is no value. Loan payment due alert, there is no value. Loan payment past due alert, there is no value. Personal reminder and periodic balance alerts, this date is the Start Date that the alert will begin to be sent on.
- */
- void setThreshold(String threshold);
-
- /**
- * Trigger : Balance alert, the value is an operator ('GT' for Greater Than or 'LT' for Less Than). Check alert, this value is the check number. Maturity date alert, the value is the number of days prior to maturity. Loan payment due alert, the value is the number of days prior to payment due date. Loan payment past due alert, there is no value. Personal reminder and periodic balance alerts, this text is the frequency that the alert will be sent.
- *
- * @param trigger Balance alert, the value is an operator ('GT' for Greater Than or 'LT' for Less Than). Check alert, this value is the check number. Maturity date alert, the value is the number of days prior to maturity. Loan payment due alert, the value is the number of days prior to payment due date. Loan payment past due alert, there is no value. Personal reminder and periodic balance alerts, this text is the frequency that the alert will be sent.
- */
- void setTrigger(String trigger);
-
- /**
- * Type : Type of event, bill payment, balance, application, or attribute. For bill pay, type of payment (check, electronic)
- *
- * @param type Type of event, bill payment, balance, application, or attribute. For bill pay, type of payment (check, electronic)
- */
- @Constraint(required = true)
- void setType(String type);
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java
deleted file mode 100755
index b0e7e176e0..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ChangePassword.java
+++ /dev/null
@@ -1,34 +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.samples.events;
-
-import org.apache.logging.log4j.samples.dto.Constraint;
-
-/**
- * Member change their password.
- */
-
-public interface ChangePassword extends org.apache.logging.log4j.samples.dto.AuditEvent {
-
- /**
- * Member : Member or End User number at the Host
- *
- * @param member Member or End User number at the Host
- */
- @Constraint(required = true)
- void setMember(String member);
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java
deleted file mode 100755
index 2f1604374d..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Login.java
+++ /dev/null
@@ -1,46 +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.samples.events;
-
-/**
- * Member logged in successfully.
- */
-
-public interface Login extends org.apache.logging.log4j.samples.dto.AuditEvent {
-
- /**
- * Member : Member or End User number at the Host
- *
- * @param member Member or End User number at the Host
- */
- void setMember(String member);
-
- /**
- * Source : Source of the End User's request; or method user used to navigate (link, button)
- *
- * @param source Source of the End User's request; or method user used to navigate (link, button)
- */
- void setSource(String source);
-
- /**
- * Start Page Option : Chosen start page destination for IB login.
- *
- * @param startPageOption Chosen start page destination for IB login.
- */
- void setStartPageOption(String startPageOption);
-
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java
deleted file mode 100755
index acb03ea462..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/ScheduledTransaction.java
+++ /dev/null
@@ -1,128 +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.samples.events;
-
-/**
- * Member set up scheduled transaction request.
- */
-
-public interface ScheduledTransaction extends org.apache.logging.log4j.samples.dto.AuditEvent {
-
- /**
- * Action : Indicates the step of the registration process. Valid actions are: Begin, Submit, Enroll Cancel,
- * Confirm Page, Rt In Process Attempt, Reg submitted, acct del, Account del submit, account auto-Select,
- * Duplicate user. Alternatively, the action the user has executed in the event
- *
- * @param action Indicates the step of the registration process. Valid actions are: Begin, Submit, Enroll Cancel,
- * Confirm Page, Rt In Process Attempt, Reg submitted, acct del, Account del submit,
- * account auto-Select, Duplicate user. Alternatively, the action the user has executed in the event
- */
- void setAction(String action);
-
- /**
- * Amount : Amount of transaction in dollars.
- *
- * @param amount Amount of transaction in dollars.
- */
- void setAmount(String amount);
-
- /**
- * Completion Notification : Completion notification
- *
- * @param completionNotification Completion notification
- */
- void setCompletionNotification(String completionNotification);
-
- /**
- * Completion Status : Whether the event succeeded or failed - success/failure and optional reason.
- *
- * @param completionStatus Whether the event succeeded or failed - success/failure and optional reason.
- */
- void setCompletionStatus(String completionStatus);
-
- /**
- * End Date : Final date for scheduled recurring transfers or PFM history request.
- *
- * @param endDate Final date for scheduled recurring transfers or PFM history request.
- */
- void setEndDate(String endDate);
-
- /**
- * Frequency : For recurring transactions, payments, the frequency (monthly, weekly) of execution.
- *
- * @param frequency For recurring transactions, payments, the frequency (monthly, weekly) of execution.
- */
- void setFrequency(String frequency);
-
- /**
- * From Account : For transfer or other transaction, the account funds are taken from.
- *
- * @param fromAccount For transfer or other transaction, the account funds are taken from.
- */
- void setFromAccount(String fromAccount);
-
- /**
- * Member : Member or End User number at the Host
- *
- * @param member Member or End User number at the Host
- */
- void setMember(String member);
-
- /**
- * Memo : Descriptive text or memo for transaction
- *
- * @param memo Descriptive text or memo for transaction
- */
- void setMemo(String memo);
-
- /**
- * Payment : Amount paid or transferred.
- *
- * @param payment Amount paid or transferred.
- */
- void setPayment(String payment);
-
- /**
- * Source : Source of the End User's request; or method user used to navigate (link, button)
- *
- * @param source Source of the End User's request; or method user used to navigate (link, button)
- */
- void setSource(String source);
-
- /**
- * SRT Identifier : Scheduled Recurring Transaction Identifier
- *
- * @param srtId Scheduled Recurring Transaction Identifier
- */
- void setSrtId(String srtId);
-
- /**
- * Start Date : Start date for Scheduled transfers/alerts or PFM history.
- *
- * @param startDate Start date for Scheduled transfers/alerts or PFM history.
- */
- void setStartDate(String startDate);
-
- /**
- * To Account : Target account or account that will receive funds in a transfer.
- *
- * @param toAccount Target account or account that will receive funds in a transfer.
- */
- void setToAccount(String toAccount);
-
-
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java
deleted file mode 100755
index 17377a989b..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/events/Transfer.java
+++ /dev/null
@@ -1,172 +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.samples.events;
-
-import org.apache.logging.log4j.samples.dto.Constraint;
-
-/**
- * Member requested transfer.
- */
-
-public interface Transfer extends org.apache.logging.log4j.samples.dto.AuditEvent {
-
- /**
- * Amount : Amount of transaction in dollars.
- *
- * @param amount Amount of transaction in dollars.
- */
- @Constraint(required = true)
- void setAmount(String amount);
-
- /**
- * Comment : Comment
- *
- * @param comment Comment
- */
- void setComment(String comment);
-
- /**
- * Completion Status : Whether the event succeeded or failed - success/failure and optional reason.
- *
- * @param completionStatus Whether the event succeeded or failed - success/failure and optional reason.
- */
- void setCompletionStatus(String completionStatus);
-
- /**
- * Confirmation Number : A date, time, and reference number.
- *
- * @param confNo A date, time, and reference number.
- */
- void setConfNo(String confNo);
-
- /**
- * From Account : For transfer or other transaction, the account funds are taken from.
- *
- * @param fromAccount For transfer or other transaction, the account funds are taken from.
- */
- @Constraint(required = true)
- void setFromAccount(String fromAccount);
-
- /**
- * From Account Type : For transfer or other transaction, the type of the account funds are taken from.
- *
- * @param fromAccountType For transfer or other transaction, the type of the account funds are taken from.
- */
- void setFromAccountType(String fromAccountType);
-
- /**
- * From Routing Number : nine digit bank code to ID the FI from which funds are taken
- *
- * @param fromRoutingNumber nine digit bank code to ID the FI from which funds are taken
- */
- void setFromRoutingNumber(String fromRoutingNumber);
-
- /**
- * Member : Member or End User number at the Host
- *
- * @param member Member or End User number at the Host
- */
- @Constraint(required = true)
- void setMember(String member);
-
- /**
- * Memo : Descriptive text or memo for transaction
- *
- * @param memo Descriptive text or memo for transaction
- */
- void setMemo(String memo);
-
- /**
- * Payment : Amount paid or transferred.
- *
- * @param payment Amount paid or transferred.
- */
- void setPayment(String payment);
-
- /**
- * Reference : Unique reference number or identifier for transfers.
- *
- * @param reference Unique reference number or identifier for transfers.
- */
- void setReference(String reference);
-
- /**
- * Result : Status of request event.
- *
- * @param result Status of request event.
- */
- void setResult(String result);
-
- /**
- * Source : Source of the End User's request; or method user used to navigate (link, button)
- *
- * @param source Source of the End User's request; or method user used to navigate (link, button)
- */
- void setSource(String source);
-
- /**
- * Status : Status of promotional email preference or online statement.
- *
- * @param status Status of promotional email preference or online statement.
- */
- void setStatus(String status);
-
- /**
- * Time Stamp : Time Stamp of event.
- *
- * @param timeStamp Time Stamp of event.
- */
- void setTimeStamp(long timeStamp);
-
- /**
- * To Account : Target account or account that will receive funds in a transfer.
- *
- * @param toAccount Target account or account that will receive funds in a transfer.
- */
- @Constraint(required = true)
- void setToAccount(String toAccount);
-
- /**
- * To Account Type : Target account type such as savings or checking.
- *
- * @param toAccountType Target account type such as savings or checking.
- */
- void setToAccountType(String toAccountType);
-
- /**
- * To Routing Number : nine digit bank code to ID the FI to receive funds
- *
- * @param toRoutingNumber nine digit bank code to ID the FI to receive funds
- */
- void setToRoutingNumber(String toRoutingNumber);
-
- /**
- * Transaction Type : Type of transfer, i.e., withdrawal, LOC Paydown, CD redemption, lucky transfer.
- *
- * @param transactionType Type of transfer, i.e., withdrawal, LOC Paydown, CD redemption, lucky transfer.
- */
- void setTransactionType(String transactionType);
-
- /**
- * Type : Type of event, bill payment, balance, application, or attribute. For bill pay, type of payment (check, electronic)
- *
- * @param type Type of event, bill payment, balance, application, or attribute. For bill pay, type of payment (check, electronic)
- */
- void setType(String type);
-
-
-}
diff --git a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java b/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java
deleted file mode 100755
index f6552fb585..0000000000
--- a/log4j-samples/log4j-samples-flume-common/src/main/java/org/apache/logging/log4j/samples/util/NamingUtils.java
+++ /dev/null
@@ -1,85 +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.samples.util;
-
-import org.apache.logging.log4j.util.Strings;
-
-public class NamingUtils {
-
- public static String getPackageName(final String className) {
- return className.substring(0, className.lastIndexOf("."));
- }
-
- public static String getSimpleName(final String className) {
- return className.substring(className.lastIndexOf(".") + 1);
- }
-
- public static String getMethodShortName(final String name) {
- return name.replaceFirst("(get|set|is|has)", Strings.EMPTY);
- }
-
- public static String upperFirst(final String name) {
- return String.valueOf(name.charAt(0)).toUpperCase() + name.substring(1);
- }
-
- public static String lowerFirst(final String name) {
- return String.valueOf(name.charAt(0)).toLowerCase() + name.substring(1);
- }
-
- public static String getSetterName(final String fieldName) {
- return "set" + upperFirst(fieldName);
- }
-
- public static String getGetterName(final String fieldName, final String type) {
- return ("boolean".equals(type) ? "is" : "get") + upperFirst(fieldName);
- }
-
- public static void main(final String[] args) {
- final String blah = "com.test.generator.Classname";
- System.out.println(getSimpleName(blah));
- System.out.println(lowerFirst(getSimpleName(blah)));
-
- System.out.println(getPackageName(blah));
-
- System.out.println(getMethodShortName("getName"));
- System.out.println(getMethodShortName("setName"));
- }
-
- public static String getClassName(final String className) {
- return upperFirst(className.replaceAll("[^a-zA-Z0-9_]+", Strings.EMPTY));
- }
-
- public static String getFieldName(final String fieldName) {
- return fieldName.replaceAll("[^a-zA-Z0-9_]+", Strings.EMPTY);
- }
-
- public static String methodCaseName(final String variable) {
- return variable.substring(0, 1).toUpperCase() + variable.substring(1);
- }
-
- public static String getAccessorName(final String type, final String methodName) {
- String prefix = "get";
- if (type.equals("boolean")) {
- prefix = "is";
- }
- return prefix + methodCaseName(methodName);
- }
-
- public static String getMutatorName(final String methodName) {
- return "set" + methodCaseName(methodName);
- }
-}
diff --git a/log4j-samples/log4j-samples-flume-embedded/.gitignore b/log4j-samples/log4j-samples-flume-embedded/.gitignore
deleted file mode 100644
index 9f0fc218e1..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
diff --git a/log4j-samples/log4j-samples-flume-embedded/README.txt b/log4j-samples/log4j-samples-flume-embedded/README.txt
deleted file mode 100644
index 31bbe0ea74..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/README.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Sample to utilize an embedded Flume agent to connect to a remote Flume Agent via Avro.
-
-This sample uses the classes in the sample flume-common project. It will randomly pick from the events defined there
-and send them to Flume. At the same time it will intermix some random non-audit events.
-
-To run this sample:
-1. Run "mvn install" on the log4j-samples-flume-common project.
-2. Download and install Flume.
-3. Copy the flume-conf.properties in src/main/resources/flume/conf to the conf directory of where Flume was installed.
-4. In a terminal window start flume using "bin/flume-ng agent --conf ./conf/ -f conf/flume-conf.properties -Dflume.root.logger=DEBUG,console -n agent"
-5. Verify Flume started and configured an Avro source, a memory channel and a logger sink by reviewing the startup log.
-6. In a separate terminal window run "mvn jetty:run" in this project.
-7. Verify the Flume appender connected to the Flume agent by finding "Started SelectChannelConnector@0.0.0.0:8080"
- in the jetty log and that there are no exceptions and also by seeing something like
- "/127.0.0.1:53351 => /127.0.0.1:8800] OPEN" in the Flume log.
-8. In a separate terminal window in the project directory run "tail -f target/logs/app.log" to see the application
- generate non-audit logs.
-9. In the browser go to url "http://localhost:8080/flumeAgent/start.do". A started message should appear on the screen.
-10. After verifying logs are being written click on the Stop button in the browser page.
-
-The output from the Flume agent will include the generated Flume events. Since the events are sent by the embedded
-Flume agent in a batch the Flume agent will only print a hex dump of the first few bytes of the event.
\ No newline at end of file
diff --git a/log4j-samples/log4j-samples-flume-embedded/pom.xml b/log4j-samples/log4j-samples-flume-embedded/pom.xml
deleted file mode 100644
index 90ffd2ffe2..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>log4j-samples</artifactId>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>log4j-samples-flume-embedded</artifactId>
- <packaging>war</packaging>
- <name>Apache Log4j Samples: Flume - Embedded</name>
- <url>http://maven.apache.org</url>
- <properties>
- <log4jParentDir>${basedir}/../..</log4jParentDir>
- <module.name>org.apache.logging.log4j.samples.flume.embedded</module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-flume-ng</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume.flume-ng-channels</groupId>
- <artifactId>flume-file-channel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-node</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-samples-flume-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>../../src/main/resources</directory>
- </resource>
- <resource>
- <directory>../../src/main/webapp/WEB-INF</directory>
- <includes>
- <include>web.xml</include>
- </includes>
- <filtering>true</filtering>
- <targetPath>${project.build.directory}</targetPath>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <contextPath>flumeAgent</contextPath>
- <webXml>${project.build.directory}/web.xml</webXml>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- <systemProperties>
- <systemProperty>
- <name>log.dir</name>
- <value>${project.build.directory}/logs</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/log4j-samples/log4j-samples-flume-embedded/src/main/resources/flume/conf/flume-conf.properties b/log4j-samples/log4j-samples-flume-embedded/src/main/resources/flume/conf/flume-conf.properties
deleted file mode 100644
index 9cbbfdeb5d..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/src/main/resources/flume/conf/flume-conf.properties
+++ /dev/null
@@ -1,50 +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.
-
-
-# The configuration file needs to define the sources,
-# the channels and the sinks.
-# Sources, channels and sinks are defined per agent,
-# in this case called 'agent'
-
-agent.sources = avroSrc
-agent.channels = memoryChannel
-agent.sinks = loggerSink
-
-# For each one of the sources, the type is defined
-# agent.sources.seqGenSrc.type = seq
-
-agent.sources.avroSrc.type = avro
-agent.sources.avroSrc.bind = localhost
-agent.sources.avroSrc.port = 8800
-
-# The channel can be defined as follows.
-agent.sources.avroSrc.channels = memoryChannel
-
-# Each sink's type must be defined
-agent.sinks.loggerSink.type = logger
-
-#Specify the channel the sink should use
-agent.sinks.loggerSink.channel = memoryChannel
-
-# Each channel's type is defined.
-agent.channels.memoryChannel.type = memory
-
-# Other config values specific to each type of channel(sink or source)
-# can be defined as well
-# In this case, it specifies the capacity of the memory channel
-agent.channels.memoryChannel.capacity = 100
diff --git a/log4j-samples/log4j-samples-flume-embedded/src/main/resources/log4j-embedded.xml b/log4j-samples/log4j-samples-flume-embedded/src/main/resources/log4j-embedded.xml
deleted file mode 100755
index 056e1f4a68..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/src/main/resources/log4j-embedded.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- 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.
-
--->
-<Configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
- <MarkerFilter marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL" />
- <Appenders>
-
- <Flume name="flume" ignoreExceptions="false" mdcPrefix="ReqCtx_" compress="false" embedded="true" dataDir="/tmp">
- <Agent host="localhost" port="8800" />
- <RFC5424Layout enterpriseNumber="12293" includeMDC="true" mdcId="RequestContext" appName="GL" />
- </Flume>
- <Console name="console">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36}:%L %M - %msg%n" />
- </Console>
- <RollingFile name="RollingFile" fileName="${sys:log.dir}/app.log"
- filePattern="${sys:log.dir}/app-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <pattern>%d %p %C{1.} [%t] %m%n</pattern>
- </PatternLayout>
- <Policies>
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="250 MB" />
- </Policies>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Logger name="EventLogger" level="WARN" additivity="false">
- <AppenderRef ref="flume" />
- </Logger>
- <Root level="debug">
- <AppenderRef ref="RollingFile" />
- </Root>
- </Loggers>
-</Configuration>
diff --git a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/applicationContext.xml b/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100755
index f4b160d761..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:context="http://www.springframework.org/schema/context" xmlns:oxm="http://www.springframework.org/schema/oxm"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/tx
- http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
- http://www.springframework.org/schema/oxm
- http://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <context:component-scan base-package="org.apache.logging.log4j.samples">
- <context:exclude-filter type="annotation"
- expression="org.springframework.ws.server.endpoint.annotation.Endpoint" />
- <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller" />
- </context:component-scan>
-
-</beans>
diff --git a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/rest-servlet.xml b/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/rest-servlet.xml
deleted file mode 100755
index 73f4fb6eda..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/rest-servlet.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:oxm="http://www.springframework.org/schema/oxm" xmlns:sws="http://www.springframework.org/schema/web-services"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/oxm
- http://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd
- http://www.springframework.org/schema/tx
- http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <context:component-scan base-package="org.apache.logging.log4j.samples.*" />
-
-</beans>
diff --git a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/web.xml b/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index 7a64562f6f..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>Global Logging Services</display-name>
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>rest</servlet-name>
- <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
- <load-on-startup>6</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>rest</servlet-name>
- <url-pattern>*.do</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
- <session-config>
- <session-timeout>5</session-timeout>
- </session-config>
-
- <listener>
- <listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>
- </listener>
-
- <context-param>
- <param-name>log4jConfiguration</param-name>
- <param-value>file://${project.build.directory}/classes/log4j-embedded.xml</param-value>
- </context-param>
-
- <context-param>
- <param-name>log4jContextName</param-name>
- <param-value>GLS</param-value>
- </context-param>
-</web-app>
diff --git a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/start.jsp b/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/start.jsp
deleted file mode 100644
index 8db53a2c7c..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/start.jsp
+++ /dev/null
@@ -1,30 +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.
---%>
-<html>
-<body>
-
-<h2>Rest Client</h2>
-<p>
- Started
-</p>
-<form action="stop.do" method="GET">
- <input type="submit" value="Stop" />
-</form>
-</body>
-</html>
-
-
diff --git a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/stop.jsp b/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/stop.jsp
deleted file mode 100644
index fab3be6de4..0000000000
--- a/log4j-samples/log4j-samples-flume-embedded/src/main/webapp/stop.jsp
+++ /dev/null
@@ -1,28 +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.
---%>
-<html>
-<body>
-
-<h2>Rest Client</h2>
-<p>
- Stopped
-</p>
-<form action="start.do" method="GET">
- <input type="submit" value="Start" />
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/log4j-samples/log4j-samples-flume-remote/.gitignore b/log4j-samples/log4j-samples-flume-remote/.gitignore
deleted file mode 100644
index 9f0fc218e1..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/.settings/
-/target/
-/.classpath
-/.project
diff --git a/log4j-samples/log4j-samples-flume-remote/README.txt b/log4j-samples/log4j-samples-flume-remote/README.txt
deleted file mode 100644
index 3ab80d2fe3..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/README.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Sample to connect to a Flume Agent via Avro using the FlumeAppender.
-
-This sample uses the classes in the sample flume-common project. It will randomly pick from the events defined there
-and send them to Flume. At the same time it will intermix some random non-audit events.
-
-To run this sample:
-1. Run "mvn install" on the flume-common project.
-2. Download and install Flume.
-3. Copy the flume-conf.properties in src/main/resources/flume/conf to the conf directory of where Flume was installed.
-4. In a terminal window start flume using "bin/flume-ng agent --conf ./conf/ -f conf/flume-conf.properties -Dflume.root.logger=DEBUG,console -n agent"
-5. Verify Flume started and configured an Avro source, a memory channel and a logger sink by reviewing the startup log.
-6. In a separate terminal window run "mvn jetty:run" in this project.
-7. Verify the Flume appender connected to the Flume agent by finding "Starting FlumeAvroManager FlumeAvro[localhost:8800]"
- in the jetty log and that there are no exceptions and also by seeing something like
- "/127.0.0.1:53351 => /127.0.0.1:8800] OPEN" in the Flume log.
-8. In a separate terminal window in the project directory run "tail -f target/logs/app.log" to see the application
- generate non-audit logs.
-9. In the browser go to url "http://localhost:8080/flumeAgent/start.do". A started message should appear on the screen.
-10. After verifying logs are being written click on the Stop button in the browser page.
-
-Note that the Flume agent must be started for the FlumeAppender to successfully start. If the Flume agent is stopped
-an exception will be thrown for each event that occurs while the agent is down. When the agent restarts the
-appender will automatically reconnect.
-
-The output from the Flume agent will include the generated Flume events. Since the events are sent individually
-Avro will print the full event and Flume will print a hex dump of the first few bytes of the event.
\ No newline at end of file
diff --git a/log4j-samples/log4j-samples-flume-remote/pom.xml b/log4j-samples/log4j-samples-flume-remote/pom.xml
deleted file mode 100644
index 8936f4f3bd..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>log4j-samples</artifactId>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>log4j-samples-flume-remote</artifactId>
- <packaging>war</packaging>
- <name>Apache Log4j Samples: Flume - Remote</name>
- <properties>
- <log4jParentDir>${basedir}/../..</log4jParentDir>
- <module.name>org.apache.logging.log4j.samples.flume.remote</module.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-flume-ng</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-samples-flume-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <resources>
- <resource>
- <directory>../../src/main/resources</directory>
- </resource>
- <resource>
- <directory>../../src/main/webapp/WEB-INF</directory>
- <includes>
- <include>web.xml</include>
- </includes>
- <filtering>true</filtering>
- <targetPath>${project.build.directory}</targetPath>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <contextPath>flumeAgent</contextPath>
- <webXml>${project.build.directory}/web.xml</webXml>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- <systemProperties>
- <systemProperty>
- <name>log.dir</name>
- <value>${project.build.directory}/logs</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/log4j-samples/log4j-samples-flume-remote/src/main/resources/flume/conf/flume-conf.properties b/log4j-samples/log4j-samples-flume-remote/src/main/resources/flume/conf/flume-conf.properties
deleted file mode 100644
index 9cbbfdeb5d..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/src/main/resources/flume/conf/flume-conf.properties
+++ /dev/null
@@ -1,50 +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.
-
-
-# The configuration file needs to define the sources,
-# the channels and the sinks.
-# Sources, channels and sinks are defined per agent,
-# in this case called 'agent'
-
-agent.sources = avroSrc
-agent.channels = memoryChannel
-agent.sinks = loggerSink
-
-# For each one of the sources, the type is defined
-# agent.sources.seqGenSrc.type = seq
-
-agent.sources.avroSrc.type = avro
-agent.sources.avroSrc.bind = localhost
-agent.sources.avroSrc.port = 8800
-
-# The channel can be defined as follows.
-agent.sources.avroSrc.channels = memoryChannel
-
-# Each sink's type must be defined
-agent.sinks.loggerSink.type = logger
-
-#Specify the channel the sink should use
-agent.sinks.loggerSink.channel = memoryChannel
-
-# Each channel's type is defined.
-agent.channels.memoryChannel.type = memory
-
-# Other config values specific to each type of channel(sink or source)
-# can be defined as well
-# In this case, it specifies the capacity of the memory channel
-agent.channels.memoryChannel.capacity = 100
diff --git a/log4j-samples/log4j-samples-flume-remote/src/main/resources/log4j-remote.xml b/log4j-samples/log4j-samples-flume-remote/src/main/resources/log4j-remote.xml
deleted file mode 100755
index 324b17d190..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/src/main/resources/log4j-remote.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- 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.
-
--->
-<Configuration status="debug" name="Flume" verbose="false" monitorInterval="30">
- <MarkerFilter marker="EVENT" onMatch="ACCEPT" onMismatch="NEUTRAL" />
- <Appenders>
-
- <Flume name="flume" ignoreExceptions="false" mdcPrefix="ReqCtx_" compress="false">
- <Agent host="localhost" port="8800" />
- <RFC5424Layout enterpriseNumber="12293" includeMDC="true" mdcId="RequestContext" appName="GL" />
- </Flume>
- <Console name="console">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %class{36}:%L %M - %msg%n" />
- </Console>
- <RollingFile name="RollingFile" fileName="${sys:log.dir}/app.log"
- filePattern="${sys:log.dir}/app-%d{MM-dd-yyyy}-%i.log.gz">
- <PatternLayout>
- <pattern>%d %p %C{1.} [%t] %m%n</pattern>
- </PatternLayout>
- <Policies>
- <TimeBasedTriggeringPolicy />
- <SizeBasedTriggeringPolicy size="250 MB" />
- </Policies>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Logger name="EventLogger" level="WARN" additivity="false">
- <AppenderRef ref="flume" />
- </Logger>
- <Root level="debug">
- <AppenderRef ref="RollingFile" />
- </Root>
- </Loggers>
-</Configuration>
diff --git a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/applicationContext.xml b/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100755
index f4b160d761..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
- xmlns:context="http://www.springframework.org/schema/context" xmlns:oxm="http://www.springframework.org/schema/oxm"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/tx
- http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
- http://www.springframework.org/schema/oxm
- http://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <context:component-scan base-package="org.apache.logging.log4j.samples">
- <context:exclude-filter type="annotation"
- expression="org.springframework.ws.server.endpoint.annotation.Endpoint" />
- <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller" />
- </context:component-scan>
-
-</beans>
diff --git a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/rest-servlet.xml b/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/rest-servlet.xml
deleted file mode 100755
index 73f4fb6eda..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/rest-servlet.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
- xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context"
- xmlns:oxm="http://www.springframework.org/schema/oxm" xmlns:sws="http://www.springframework.org/schema/web-services"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
- http://www.springframework.org/schema/oxm
- http://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd
- http://www.springframework.org/schema/tx
- http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd">
-
- <context:component-scan base-package="org.apache.logging.log4j.samples.*" />
-
-</beans>
diff --git a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/web.xml b/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index 0a0961d66d..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>Global Logging Services</display-name>
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>rest</servlet-name>
- <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
- <load-on-startup>6</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>rest</servlet-name>
- <url-pattern>*.do</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
- <session-config>
- <session-timeout>5</session-timeout>
- </session-config>
-
- <listener>
- <listener-class>org.apache.logging.log4j.web.Log4jServletContextListener</listener-class>
- </listener>
-
- <context-param>
- <param-name>log4jConfiguration</param-name>
- <param-value>file://${project.build.directory}/classes/log4j-remote.xml</param-value>
- </context-param>
-
- <context-param>
- <param-name>log4jContextName</param-name>
- <param-value>GLS</param-value>
- </context-param>
-</web-app>
diff --git a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/start.jsp b/log4j-samples/log4j-samples-flume-remote/src/main/webapp/start.jsp
deleted file mode 100644
index 8db53a2c7c..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/start.jsp
+++ /dev/null
@@ -1,30 +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.
---%>
-<html>
-<body>
-
-<h2>Rest Client</h2>
-<p>
- Started
-</p>
-<form action="stop.do" method="GET">
- <input type="submit" value="Stop" />
-</form>
-</body>
-</html>
-
-
diff --git a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/stop.jsp b/log4j-samples/log4j-samples-flume-remote/src/main/webapp/stop.jsp
deleted file mode 100644
index fab3be6de4..0000000000
--- a/log4j-samples/log4j-samples-flume-remote/src/main/webapp/stop.jsp
+++ /dev/null
@@ -1,28 +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.
---%>
-<html>
-<body>
-
-<h2>Rest Client</h2>
-<p>
- Stopped
-</p>
-<form action="start.do" method="GET">
- <input type="submit" value="Start" />
-</form>
-</body>
-</html>
\ No newline at end of file
diff --git a/log4j-samples/log4j-samples-loggerProperties/.gitignore b/log4j-samples/log4j-samples-loggerProperties/.gitignore
deleted file mode 100644
index ddd6d6d330..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.settings/
-/.classpath
-/.project
diff --git a/log4j-samples/log4j-samples-loggerProperties/pom.xml b/log4j-samples/log4j-samples-loggerProperties/pom.xml
deleted file mode 100644
index 29f70b8961..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>log4j-samples</artifactId>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>log4j-samples-loggerProperties</artifactId>
- <packaging>jar</packaging>
- <name>Apache Log4j Samples: LoggerProperties</name>
- <url>http://maven.apache.org</url>
- <properties>
- <log4jParentDir>${basedir}/../..</log4jParentDir>
- <module.name>org.apache.logging.log4j.samples.logger_properties</module.name>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java b/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
deleted file mode 100644
index 10b22d4283..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomLookup.java
+++ /dev/null
@@ -1,82 +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.lookup;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.lookup.AbstractLookup;
-import org.apache.logging.log4j.core.lookup.Lookup;
-import org.apache.logging.log4j.plugins.Plugin;
-import org.apache.logging.log4j.status.StatusLogger;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-@Lookup
-@Plugin("custom")
-public class CustomLookup extends AbstractLookup {
-
- private static final Logger LOGGER = StatusLogger.getLogger();
- private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
-
- private static ConcurrentMap<String, Map<String, String>> loggerProperties = new ConcurrentHashMap<>();
-
- /**
- * Looks up the value for the key using the data in the LogEvent.
- * @param event The current LogEvent.
- * @param key the key to be looked up, may be null
- * @return The value associated with the key.
- */
- @Override
- public String lookup(final LogEvent event, final String key) {
- if (event == null) {
- return null;
- }
- try {
- final Map<String, String> properties = loggerProperties.get(event.getLoggerName());
- if (properties == null) {
- return "";
- }
- if (key == null || key.length() == 0 || key.equals("*")) {
- final StringBuilder sb = new StringBuilder("{");
- boolean first = true;
- for (final Map.Entry<String, String> entry : properties.entrySet()) {
- if (!first) {
- sb.append(", ");
- }
- sb.append(entry.getKey()).append("=").append(entry.getValue());
- first = false;
- }
- sb.append("}");
- return sb.toString();
- }
- return properties.get(key);
- } catch (final Exception ex) {
- LOGGER.warn(LOOKUP, "Error while getting property [{}].", key, ex);
- return null;
- }
- }
-
- public static void setLoggerProperties(final String loggerName, final Map<String, String> properties) {
- loggerProperties.put(loggerName, properties);
- }
-
-}
-
diff --git a/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java b/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java
deleted file mode 100644
index e84a3417e8..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/CustomMapMessage.java
+++ /dev/null
@@ -1,53 +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.lookup;
-
-import java.util.Map;
-
-import org.apache.logging.log4j.message.AsynchronouslyFormattable;
-import org.apache.logging.log4j.message.StringMapMessage;
-
-/**
- *
- */
-@AsynchronouslyFormattable
-public class CustomMapMessage extends StringMapMessage {
-
- private final String message;
-
- public CustomMapMessage(final String msg, final Map<String, String> map) {
- super(map);
- this.message = msg;
- }
-
- @Override
- public String getFormattedMessage(final String[] formats) {
- if (message != null) {
- return message;
- }
- return super.getFormattedMessage(formats);
- }
-
- @Override
- public String getFormattedMessage() {
- if (message != null) {
- return message;
- }
- return super.getFormattedMessage();
- }
-
-}
diff --git a/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java b/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
deleted file mode 100644
index cbd165ba18..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/src/main/java/org/apache/logging/log4j/lookup/MapMessageLookup.java
+++ /dev/null
@@ -1,75 +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.lookup;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.lookup.AbstractLookup;
-import org.apache.logging.log4j.core.lookup.Lookup;
-import org.apache.logging.log4j.message.MapMessage;
-import org.apache.logging.log4j.message.Message;
-import org.apache.logging.log4j.plugins.Plugin;
-import org.apache.logging.log4j.status.StatusLogger;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-@Lookup
-@Plugin("mapMessage")
-public class MapMessageLookup extends AbstractLookup {
-
- private static final Logger LOGGER = StatusLogger.getLogger();
- private static final Marker LOOKUP = MarkerManager.getMarker("LOOKUP");
-
- private static ConcurrentMap<String, Map<String, String>> loggerProperties = new ConcurrentHashMap<>();
-
- /**
- * Looks up the value for the key using the data in the LogEvent.
- * @param event The current LogEvent.
- * @param key the key to be looked up, may be null
- * @return The value associated with the key.
- */
- @Override
- public String lookup(final LogEvent event, final String key) {
- if (event == null) {
- return null;
- }
- final Message msg = event.getMessage();
- if (msg instanceof MapMessage) {
- try {
- MapMessage<?, ?> mapMessage = (MapMessage) msg;
- if (key == null || key.length() == 0 || key.equals("*")) {
- return mapMessage.asString(MapMessage.MapFormat.JAVA_UNQUOTED.name());
- }
- return mapMessage.get(key);
- } catch (final Exception ex) {
- LOGGER.warn(LOOKUP, "Error while getting property [{}].", key, ex);
- return null;
- }
- }
- return null;
- }
-
- public static void setLoggerProperties(final String loggerName, final Map<String, String> properties) {
- loggerProperties.put(loggerName, properties);
- }
-
-}
-
diff --git a/log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java b/log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java
deleted file mode 100644
index 5c5321b494..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/CustomPropertiesTest.java
+++ /dev/null
@@ -1,51 +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;
-
-import org.apache.logging.log4j.lookup.CustomLookup;
-import org.apache.logging.log4j.lookup.CustomMapMessage;
-import org.junit.Test;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Created by rgoers on 8/2/15.
- */
-public class CustomPropertiesTest {
-
- @Test
- public void testProperties() throws Exception {
- final Logger logger = LogManager.getLogger("TestProperties");
- final Map<String, String> loggerProperties = new ConcurrentHashMap<>();
- CustomLookup.setLoggerProperties("TestProperties", loggerProperties);
- loggerProperties.put("key1", "CustomPropertiesTest");
- loggerProperties.put("key2", "TestValue");
- logger.debug("This is a test");
- }
-
- @Test
- public void mapMessageProperties() throws Exception {
- final Logger logger = LogManager.getLogger("MapProperties");
- final Map<String, String> loggerProperties = new ConcurrentHashMap<>();
- loggerProperties.put("key1", "CustomPropertiesTest");
- loggerProperties.put("key2", "TestValue");
- logger.debug(new CustomMapMessage("This is a test", loggerProperties));
- }
-
-
-}
diff --git a/log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java b/log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java
deleted file mode 100644
index d2f55ccb4e..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/src/test/java/org/apache/logging/log4j/MapMessageLookupTest.java
+++ /dev/null
@@ -1,89 +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;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.impl.Log4jLogEvent;
-import org.apache.logging.log4j.lookup.MapMessageLookup;
-import org.apache.logging.log4j.message.MapMessage;
-import org.apache.logging.log4j.message.StringMapMessage;
-import org.apache.logging.log4j.message.StructuredDataMessage;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Tests {@link MapMessageLookup}
- */
-public class MapMessageLookupTest
-{
- @Test
- public void testStructuredDataMessageLookup() {
- // GIVEN: A StructuredDataMessage object
- final StructuredDataMessage message = new StructuredDataMessage("id", "msg", "type");
-
- message.put("A", "a");
- message.put("B", "b");
- message.put("C", "c");
-
- // AND: An event with that message
- final LogEvent event = Log4jLogEvent.newBuilder().setLevel(Level.DEBUG).setMessage(message).build();
-
- // AND: A MapMessageLookup object
- final MapMessageLookup lookup = new MapMessageLookup();
-
- // WHEN: Lookup is performed
- final String a = lookup.lookup(event, "A");
- final String b = lookup.lookup(event, "B");
- final String c = lookup.lookup(event, "C");
-
- // THEN: The looked up values are correct
- assertEquals("a", a);
- assertEquals("b", b);
- assertEquals("c", c);
- }
-
- @Test
- public void testStringMapMessageLookup() {
- // GIVEN: A StringMapMessage object
- final Map<String, String> values = new HashMap<>(3);
- values.put("A", "a");
- values.put("B", "b");
- values.put("C", "c");
- final MapMessage message = new StringMapMessage(values);
-
- // AND: An event with that message
- final LogEvent event = Log4jLogEvent.newBuilder().setLevel(Level.DEBUG).setMessage(message).build();
-
- // AND: A MapMessageLookup object
- final MapMessageLookup lookup = new MapMessageLookup();
-
- // WHEN: Lookup is performed
- final String a = lookup.lookup(event, "A");
- final String b = lookup.lookup(event, "B");
- final String c = lookup.lookup(event, "C");
-
- // THEN: The looked up values are correct
- assertEquals("a", a);
- assertEquals("b", b);
- assertEquals("c", c);
- }
-}
diff --git a/log4j-samples/log4j-samples-loggerProperties/src/test/resources/log4j2.xml b/log4j-samples/log4j-samples-loggerProperties/src/test/resources/log4j2.xml
deleted file mode 100644
index 0aa688b2db..0000000000
--- a/log4j-samples/log4j-samples-loggerProperties/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<Configuration name="XMLPerfTest" status="error">
- <Appenders>
- <File name="TestLogfile" fileName="target/testlog4j2.log" immediateFlush="false">
- <PatternLayout>
- <Pattern>%d %5p [%t] %c{1} - %m%n</Pattern>
- </PatternLayout>
- </File>
- <RandomAccessFile name="RandomAccessLogFile" fileName="target/testCustomlog4j2.log" immediateFlush="false">
- <PatternLayout>
- <Pattern>%d %5p [%t] %c{1} %X{key1} %X{key2} - %m%n</Pattern>
- </PatternLayout>
- </RandomAccessFile>
- </Appenders>
- <Loggers>
- <Logger name="TestProperties" level="debug" additivity="false">
- <Property name="key1">$${custom:key1}</Property>
- <Property name="key2">$${custom:key2}</Property>
- <AppenderRef ref="RandomAccessLogFile"/>
- </Logger>
- <Logger name="MapProperties" level="debug" additivity="false">
- <Property name="key1">$${mapMessage:key1}</Property>
- <Property name="key2">$${mapMessage:key2}</Property>
- <AppenderRef ref="RandomAccessLogFile"/>
- </Logger>
-
- <Root level="debug">
- <AppenderRef ref="TestLogfile"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/log4j-samples/pom.xml b/log4j-samples/pom.xml
deleted file mode 100644
index 25746faa7c..0000000000
--- a/log4j-samples/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-samples</artifactId>
- <packaging>pom</packaging>
- <name>Apache Log4j Samples</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <log4jParentDir>${basedir}/..</log4jParentDir>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.deploy.skip>true</maven.deploy.skip>
- <maven.install.skip>true</maven.install.skip>
- <maven-jetty-plugin.version>6.1.26</maven-jetty-plugin.version>
- <spring-ws.version>4.0.0</spring-ws.version>
- </properties>
-
- <dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-samples-flume-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- <version>${spring-ws.version}</version>
- </dependency>
- </dependencies>
-
- </dependencyManagement>
-
- <modules>
- <module>log4j-samples-configuration</module>
- <module>log4j-samples-flume-common</module>
- <module>log4j-samples-flume-embedded</module>
- <module>log4j-samples-flume-remote</module>
- <module>log4j-samples-loggerProperties</module>
- </modules>
- <build>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>${maven-jetty-plugin.version}</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
-
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
-
- <!-- `enforce-upper-bound-deps` enforcer using `requireUpperBoundDeps` directive has been of no help so far.
- It is a source of compilation errors that have nothing much to do with Log4j.
- Hence, disabling it for samples: -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-upper-bound-deps</id>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
-
- </build>
-
-</project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/Dockerfile b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/Dockerfile
deleted file mode 100644
index d4402e8b8e..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/Dockerfile
+++ /dev/null
@@ -1,33 +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.
-#
-# Alpine Linux with OpenJDK
-#FROM openjdk:8-jdk-alpine
-FROM openjdk:11-jdk-slim
-
-ARG build_version
-ENV BUILD_VERSION=${build_version}
-RUN mkdir /service
-
-ADD ./target/sampleapp.jar /service/
-WORKDIR /service
-
-#EXPOSE 8080 5005
-EXPOSE 8080
-
-#CMD java "-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005" -jar sampleapp.jar
-ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar -Xmx1G sampleapp.jar"]
-
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md
deleted file mode 100644
index 686be3a70a..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Log4j Spring Cloud Sample Application
-
-This application uses Spring Boot and reads the logging configuration from the companion Spring Cloud Config Server
-project. The log4j2.xml file is located in the config-repo directory in that project.
-
-## Running With Docker
-This sample packages the application in a docker container that is packaged with rabbit-mq (to allow dynamic updates
-from Spring Cloud Config), fluent-bit (to test as a log forwarder), Apache Flume (to test as a log forwarder), and
-Apache Kafka also as a log forwarder. It also installs Socat, a proxy to allow access to the Docker REST API.
-###Prerequisites
-Note: This guide assumes you already have docker installed. If you do not you may either use homebrew to install
-it or follow the instructions at https://docs.docker.com/docker-for-mac/install/.
-
-Like Log4j, the sample app uses the Maven toolchains plugin. The sample app may be built with Java 8 but is
-configured to run in a docker container with Java 11.
-
-The KafkaAppender requires a Kafka instance to write to. On MacOS a Kafka instance can be created by
-```
-brew install kafka
-zookeeper-server-start /usr/local/etc/kafka/zookeeper.properties & kafka-server-start /usr/local/etc/kafka/server.properties
-```
-
-### Starting the Application
-* Start the companion rabbit-mq, fluent-bit and flume images `./docker/up.sh`
-* Compile and start local application image `./docker/restartApp.sh`
-* The application exposes two endpoints.
- 1. http://localhost:8080/sample/log?threads=1&count=100000 This endpoint will log up to 100,000 events using
- 1 or more threads.
- 1. http://localhost:8080/sample/exception This endpoint generates an exception that can be used to verify whether
- multiline logging works with the chosen set of components.
-
-### Viewing the logs
-
-Accessing the log files varies depending on the appending being used. When logging to the console "docker logs" may
-be used. As configured, Flume will write to files in /var/log/flume, fluent-bit to the standard output of its container.
-Kafka output may be viewed using a tool like [Kafka Tool](http://www.kafkatool.com/).
-
-## Running with Kubernetes
-
-This sample has been verified to run in a Docker Desktop for Mac environment with Kubernetes enabled and may run in
-other Kubernetes environments.
-
-### Prerequisites
-Note: This guide assumes you already have Docker and Kubernetes installed. Since the same container is used for
-Kubernetes as with Docker, Java 11 is also required. This implmentation uses an ELK stack which is expected to
-be installed. They can be downloaded individually and started as local applications on the development
-machine for testing. Logstash should be configured as shown in
-[Logging in the Cloud](http://logging.apache.org/log4j/2.x/manual/cloud.html).
-
-### Starting the Application
-Run the ```docker/deploy.sh``` command from the base directory of the log4j-spring-cloud-config-sample-application
-project. This will build the application and then deploy it to Kubernetes. You should see the start-up logs in Kibana.
-To stop, run the ```docker/undeploy.sh``` script, then run ```docker images``` and perform
-```docker rmi --force {image id}``` where image id is the id of the image for the sample application.
-
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/app-compose.yml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/app-compose.yml
deleted file mode 100755
index 9864e8e304..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/app-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: "3"
-services:
- sampleapp:
- container_name: sampleapp
- image: sampleapp
- environment:
- DOCKER_URI: http://socat:1234
- SERVICE_PARAMS: --spring.config.location=classpath:/,classpath:/application-local-docker.yml
- ports:
- - "5005:5005"
- - "8080:8080"
- networks:
- sample_network:
- aliases:
- - sampleapp
-
-networks:
- sample_network:
-
-volumes:
- pgdata:
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/combined-compose.yml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/combined-compose.yml
deleted file mode 100755
index b2f5abb037..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/combined-compose.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-version: "3"
-services:
- socat:
- container_name: socat
- image: bobrik/socat
- command: TCP-LISTEN:1234,fork UNIX-CONNECT:/var/run/docker.sock
- expose:
- - "1234"
- volumes:
- - /var/run/docker.sock:/var/run/docker.sock
- networks:
- sample_network:
- aliases:
- - socat
-
- rabbitmq:
- container_name: rabbit
- image: rabbitmq:3-management-alpine
- expose:
- - "5672"
- - "15672"
- ports:
- - "5672:5672"
- - "15672:15672"
- volumes:
- - ./init/rabbit/rabbitmq.config:/etc/rabbitmq/rabbitmq.config:ro
- - ./init/rabbit/definitions.json:/etc/rabbitmq/definitions.json:ro
- networks:
- sample_network:
- aliases:
- - rabbitmq
-
- fluent-bit:
- container_name: fluent-bit
- image: fluent/fluent-bit:latest
- expose:
- - "2020"
- - "24221"
- - "24224"
- ports:
- - "24224:24224"
- volumes:
- - ./init/fluent-bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf
- - ./target/logs:/var/logs
- networks:
- sample_network:
- aliases:
- - fluent-bit
-
- flume:
- container_name: flume
- image: probablyfine/flume:latest
- expose:
- - "5050"
- environment:
- FLUME_AGENT_NAME: forwarder
- FLUME_JAVA_OPTS: -Dlog4j.configuration=file:///opt/flume-config/log4j.properties
- volumes:
- - ./init/flume/start-flume.sh:/opt/flume/bin/start-flume
- - ./init/flume/flume.conf:/opt/flume-config/flume.conf
- - ./init/flume/flume-env.sh:/opt/flume-config/flume-env.sh
- - ./init/flume/log4j.properties:/opt/flume-config/log4j.properties
- - ~/flume-logs:/var/log/flume
- networks:
- sample_network:
- aliases:
- - flume
-
- sampleapp:
- container_name: sampleapp
- image: sampleapp
- environment:
- DOCKER_URI: http://socat:1234
- SERVICE_PARAMS: --spring.config.location=classpath:/,classpath:/application-local-docker.yml
- ports:
- - "5005:5005"
- - "8080:8080"
- networks:
- sample_network:
- aliases:
- - sampleapp
-networks:
- sample_network:
-
-volumes:
- pgdata:
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/docker-compose.yml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/docker-compose.yml
deleted file mode 100755
index 0d76f52df3..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/docker-compose.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-version: "3"
-services:
- socat:
- container_name: socat
- image: bobrik/socat
- command: TCP-LISTEN:1234,fork UNIX-CONNECT:/var/run/docker.sock
- expose:
- - "1234"
- volumes:
- - /var/run/docker.sock:/var/run/docker.sock
- networks:
- sample_network:
- aliases:
- - socat
-
- rabbitmq:
- container_name: rabbit
- image: rabbitmq:3-management-alpine
- expose:
- - "5672"
- - "15672"
- ports:
- - "5672:5672"
- - "15672:15672"
- volumes:
- - ./init/rabbit/rabbitmq.config:/etc/rabbitmq/rabbitmq.config:ro
- - ./init/rabbit/definitions.json:/etc/rabbitmq/definitions.json:ro
- networks:
- sample_network:
- aliases:
- - rabbitmq
-
- fluent-bit:
- container_name: fluent-bit
- image: fluent/fluent-bit:latest
- expose:
- - "2020"
- - "24221"
- - "24224"
- ports:
- - "24224:24224"
- volumes:
- - ./init/fluent-bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf
- - ./target/logs:/var/logs
- networks:
- sample_network:
- aliases:
- - fluent-bit
-
- flume:
- container_name: flume
- image: probablyfine/flume:latest
- expose:
- - "5050"
- environment:
- FLUME_AGENT_NAME: forwarder
- FLUME_JAVA_OPTS: -Dlog4j.configuration=file:///opt/flume-config/log4j.properties
- volumes:
- - ./init/flume/start-flume.sh:/opt/flume/bin/start-flume
- - ./init/flume/flume.conf:/opt/flume-config/flume.conf
- - ./init/flume/flume-env.sh:/opt/flume-config/flume-env.sh
- - ./init/flume/log4j.properties:/opt/flume-config/log4j.properties
- - ~/flume-logs:/var/log/flume
- networks:
- sample_network:
- aliases:
- - flume
-
-
-networks:
- sample_network:
-
-volumes:
- pgdata:
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/down.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/down.sh
deleted file mode 100755
index d788098471..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/down.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-echo Stopping containers and removing containers, networks, volumes, and images created by up.
-DIR=`dirname "$0"`
-docker-compose --file ${DIR}/docker-compose.yml down --rmi local -v
-docker-compose --file ${DIR}/docker-compose.yml rm --force -v
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/fluent-bit/fluent-bit.conf b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/fluent-bit/fluent-bit.conf
deleted file mode 100644
index 170c7bd27a..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/fluent-bit/fluent-bit.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-[SERVICE]
- Log_Level debug
-
- HTTP_Server On
- HTTP_Listen 0.0.0.0
- HTTP_Port 2020
- Parsers_File parsers.conf
-
-[INPUT]
- Name tcp
- Listen 0.0.0.0
- Port 24221
- Chunk_Size 32
- Buffer_Size 64
-
-[INPUT]
- Name tail
- Tag kube.*
- Path /var/log/containers/*.log
- Parser docker
- DB /var/log/flb_kube.db
- Mem_Buf_Limit 5MB
- Skip_Long_Lines On
- Refresh_Interval 10
-
-[OUTPUT]
- Name stdout
- Match *
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume-env.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume-env.sh
deleted file mode 100644
index 4224abd155..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume-env.sh
+++ /dev/null
@@ -1,15 +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.
-JAVA_OPTS="-Xmx200m"
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume.conf b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume.conf
deleted file mode 100644
index 40fc528f0c..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/flume.conf
+++ /dev/null
@@ -1,46 +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.
-# Accepts incoming requests and forwards them
-
-# Name the components on this agent
-forwarder.sources = avro
-forwarder.sinks = sink1
-forwarder.channels = channel1
-
-# Describe/configure the source
-forwarder.sources.avro.type = avro
-forwarder.sources.avro.bind = 0.0.0.0
-forwarder.sources.avro.port = 5050
-forwarder.sources.avro.compression-type = none
-
-
-# Describe the sink
-forwarder.sinks.sink1.type = logger
-
-forwarder.sinks.sink1.type = file_roll
-forwarder.sinks.sink1.sink.directory = /var/log/flume/
-forwarder.sinks.sink1.sink.pathManager.extension=log
-forwarder.sinks.sink1.channel = channel1
-forwarder.sinks.sink1.sink.rollInterval = 300
-forwarder.sinks.sink1.sink.serializer = text
-
-# Use a channel which buffers events in memory
-forwarder.channels.channel1.type = memory
-forwarder.channels.channel1.capacity = 100000
-forwarder.channels.channel1.transactionCapacity = 10000
-
-# Bind the source and sink to the channel
-forwarder.sources.avro.channels = channel1
-forwarder.sinks.sink1.channel = channel1
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/log4j.properties b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/log4j.properties
deleted file mode 100644
index fd858a216b..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/log4j.properties
+++ /dev/null
@@ -1,23 +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.
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO, A1
-
-# A1 is set to be a ConsoleAppender.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/start-flume.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/start-flume.sh
deleted file mode 100755
index 021d1f75c5..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/flume/start-flume.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-# 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.
-
-FLUME_CONF_DIR=/opt/flume-config
-
-[[ -d "${FLUME_CONF_DIR}" ]] || { echo "Flume config file not mounted in /opt/flume-config"; exit 1; }
-[[ -z "${FLUME_AGENT_NAME}" ]] && { echo "FLUME_AGENT_NAME required"; exit 1; }
-
-echo "Starting flume agent : ${FLUME_AGENT_NAME}"
-
-flume-ng agent \
- -c ${FLUME_CONF_DIR} \
- -f ${FLUME_CONF_DIR}/flume.conf \
- -n ${FLUME_AGENT_NAME} \
- $*
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/definitions.json b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/definitions.json
deleted file mode 100644
index 835f10e0a9..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/definitions.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "rabbit_version": "3.6.14",
- "users": [
- {
- "name": "guest",
- "password_hash": "8NWJazmxFqF0nohjVsE6rRP9wvwzEq/fpUel2in5Y3YAE3KZ",
- "hashing_algorithm": "rabbit_password_hashing_sha256",
- "tags": "administrator"
- }
- ],
- "vhosts": [
- {
- "name": "/"
- }
- ],
- "permissions": [
- {
- "user": "guest",
- "vhost": "/",
- "configure": ".*",
- "write": ".*",
- "read": ".*"
- }
- ],
- "parameters": [],
- "global_parameters": [
- {
- "name": "cluster_name",
- "value": "rabbit@c85301775966"
- }
- ],
- "policies": [],
- "queues": [],
- "exchanges": [],
- "bindings": []
-}
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/rabbitmq.config b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/rabbitmq.config
deleted file mode 100644
index b55f5088bf..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/init/rabbit/rabbitmq.config
+++ /dev/null
@@ -1,14 +0,0 @@
-[
- {
- rabbit,
- [
- { loopback_users, [] }
- ]
- },
- {
- rabbitmq_management,
- [
- { load_definitions, "/etc/rabbitmq/definitions.json" }
- ]
- }
-].
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/logs.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/logs.sh
deleted file mode 100755
index 109664ea7f..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/logs.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-DIR=`dirname "$0"`
-# dump existing logs and start tailing them
-# https://docs.docker.com/compose/reference/logs
-docker-compose --file ${DIR}/../docker/docker-compose.yml logs --follow --tail=all
-
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/restartApp.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/restartApp.sh
deleted file mode 100755
index 65b779b440..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/restartApp.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-imageName=sampleapp
-containerName=app-container
-networkName=docker_sample_network
-debug_port=5005
-#debug_expose="-p $debug_port:$debug_port"
-exposed_ports="-p 8080:8080 $debug_expose"
-
-mvn clean package -DskipTests=true
-
-docker build -t $imageName -f Dockerfile .
-
-echo Delete old container...
-docker rm -f $containerName
-
-echo Run new container...
-docker run -e "SERVICE_PARAMS=--spring.config.location=classpath:/,classpath:/application-local-docker.yml" \
- -e "DOCKER_URI=http://socat:1234" -e "JAVA_OPTS=-Dlogstash.search.host=host.docker.internal" \
- --network=$networkName -d $exposed_ports --name $containerName -h sample $imageName
-# --log-driver=fluentd --log-opt fluentd-address=host.docker.internal:24224 \
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stop.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stop.sh
deleted file mode 100755
index 3eccb308dd..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stop.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-echo Stopping running containers without removing them.
-
-DIR=`dirname "$0"`
-docker-compose --file ${DIR}/../docker/docker-compose.yml stop
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stopApp.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stopApp.sh
deleted file mode 100755
index f5e7d56732..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/stopApp.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-containerName=app-container
-docker rm -f $containerName
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/up.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/up.sh
deleted file mode 100755
index f4bb956b28..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/docker/up.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-echo "Building, (re)creating, starting, and attaching to containers for a service."
-
-DIR=`dirname "$0"`
-docker-compose --file ${DIR}/docker-compose.yml up --detach --build
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/deploy.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/deploy.sh
deleted file mode 100755
index 9f67de218f..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/deploy.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-#
-#
-# 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.
-#
-
-echo "Building, (re)creating, starting, and attaching to containers for a service."
-
-imageName=sampleapp
-containerName=sampleapp-container
-networkName=docker_sampleapp
-debug_port=5005
-#debug_expose="-p $debug_port:$debug_port"
-exposed_ports="-p 8080:8090 $debug_expose"
-
-mvn clean package -DskipTests=true
-docker build --no-cache -t $imageName -f Dockerfile .
-
-docker tag $imageName localhost:5000/$imageName
-docker push localhost:5000/$imageName
-kubectl apply -f k8s/sampleapp-deployment.yaml
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/sampleapp-deployment.yaml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/sampleapp-deployment.yaml
deleted file mode 100644
index ffd28518d8..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/sampleapp-deployment.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: sampleapp
- labels:
- app: sampleapp
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: sampleapp
- template:
- metadata:
- labels:
- app: sampleapp
- spec:
- containers:
- - name: sampleapp
- image: localhost:5000/sampleapp:latest
- imagePullPolicy: Always
- ports:
- - containerPort: 8080
- - containerPort: 5005
- env:
- - name: JAVA_OPTS
- value: "-Delastic.search.host=host.docker.internal"
- - name: key-value-store
- image: redis
- ports:
- - containerPort: 6379
-
-
----
-apiVersion: v1
-kind: Service
-metadata:
- name: sampleapp
-spec:
- selector:
- app: sampleapp
- ports:
- - protocol: TCP
- port: 8080
- targetPort: 8080
- name: http
- - protocol: TCP
- port: 6379
- targetPort: 6379
- name: redis
- - protocol: TCP
- port: 5005
- targetPort: 5005
- name: debug
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/undeploy.sh b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/undeploy.sh
deleted file mode 100755
index c5255c9654..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/k8s/undeploy.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-#
-#
-# 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.
-#
-
-echo "Building, (re)creating, starting, and attaching to containers for a service."
-
-imageName=sampleapp
-containerName=sampleapp-container
-networkName=docker_sampleapp
-
-kubectl delete deploy/$imageName svc/$imageName
-
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
deleted file mode 100644
index de492f8752..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-spring-cloud-config-samples</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>log4j-spring-cloud-config-sample-application</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache Log4j Spring Cloud Config Sample Application</name>
- <url>http://maven.apache.org</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <log4jParentDir>${basedir}/../../..</log4jParentDir>
- <module.name>org.apache.logging.log4j.spring.cloud.config.sample.application</module.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-docker</artifactId>
- </dependency>
- <!-- Required for Flume -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-flume-ng</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-kubernetes</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-layout-template-json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-boot</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-cloud-config-client</artifactId>
- </dependency>
- <!-- Required for Async Loggers -->
- <dependency>
- <groupId>com.lmax</groupId>
- <artifactId>disruptor</artifactId>
- <optional>true</optional>
- </dependency>
- <!-- Required for Flume embedded -->
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-embedded-agent</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.flume</groupId>
- <artifactId>flume-ng-sdk</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <!-- log dependencies -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </dependency>
- <!-- Spring Boot dependencies -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <!-- Spring Cloud dependencies -->
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-bus-amqp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api-test</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- Spring Tests -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>default-jar</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${manifestfile}</manifestFile>
- <manifestEntries>
- <Specification-Title>${project.name}</Specification-Title>
- <Specification-Version>${project.version}</Specification-Version>
- <Specification-Vendor>${project.organization.name}</Specification-Vendor>
- <Implementation-Title>${project.name}</Implementation-Title>
- <Implementation-Version>${project.version}</Implementation-Version>
- <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
- <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
- <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
- <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
- <Multi-Release>true</Multi-Release>
- </manifestEntries>
- </archive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>default-test</id>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/Test*.java</include>
- <include>**/*Test.java</include>
- <include>**/IT*.java</include>
- <include>**/*IT.java</include>
- </includes>
- <excludes>
- <exclude>**/*FuncTest.java</exclude>
- </excludes>
- <forkCount>1</forkCount>
- <systemPropertyVariables>
- <environment>${environment}</environment>
- <site>${site}</site>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <profiles>
-
- </profiles>
-</project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java
deleted file mode 100644
index 0586c105a6..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/SampleApplication.java
+++ /dev/null
@@ -1,29 +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.spring.cloud.config.sample;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-@SpringBootApplication
-public class SampleApplication extends SpringBootServletInitializer {
- public static void main(final String[] args) {
- SpringApplication.run(SampleApplication.class, args);
- }
-
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java
deleted file mode 100644
index e4055b5251..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/GlobalExceptionHandler.java
+++ /dev/null
@@ -1,36 +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.spring.cloud.config.sample.config;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
-
-
-@ControllerAdvice
-public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
-
- private static final Logger LOGGER = LogManager.getLogger(GlobalExceptionHandler.class);
-
-
- private ResponseEntity<Object> getResponseEntity(final Object responseMessage, final HttpStatus httpStatus) {
- return new ResponseEntity<>(responseMessage, httpStatus);
- }
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
deleted file mode 100644
index 7ce6889dde..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
+++ /dev/null
@@ -1,39 +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.spring.cloud.config.sample.config;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.spring.cloud.config.sample.utils.spring.SampleResponseErrorHandler;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-@Configuration
-public class WebMvcConfig implements WebMvcConfigurer {
- private Logger LOGGER = LogManager.getLogger(WebMvcConfig.class);
-
- @Bean
- public RestTemplate restTemplate() {
- final RestTemplate restTemplate = new RestTemplate();
- restTemplate.setErrorHandler(new SampleResponseErrorHandler());
- return restTemplate;
- }
-
-
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java
deleted file mode 100644
index 1a6dd8973d..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/K8SController.java
+++ /dev/null
@@ -1,82 +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.spring.cloud.config.sample.controller;
-
-import java.nio.file.Paths;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.kubernetes.KubernetesClientBuilder;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.fabric8.kubernetes.api.model.Pod;
-import io.fabric8.kubernetes.client.Config;
-import io.fabric8.kubernetes.client.KubernetesClient;
-
-/**
- * Test class
- */
-@RestController
-public class K8SController {
-
- private static final Logger LOGGER = LogManager.getLogger(K8SController.class);
- private static final String HOSTNAME = "HOSTNAME";
- @Autowired
- private ObjectMapper objectMapper;
-
- @GetMapping("/k8s/pod")
- public ResponseEntity<Pod> getPod() {
- try {
- final KubernetesClient client = new KubernetesClientBuilder().createClient();
- if (client != null) {
- final Pod pod = getCurrentPod(client);
- if (pod != null) {
- LOGGER.info("Pod: {}", objectMapper.writeValueAsString(pod));
- return new ResponseEntity<>(pod, HttpStatus.OK);
- }
- }
- } catch (final Exception ex) {
- LOGGER.error("Unable to obtain or print Pod information", ex);
- }
- return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
- }
-
- private Pod getCurrentPod(final KubernetesClient kubernetesClient) {
- final String hostName = System.getenv(HOSTNAME);
- try {
- if (isServiceAccount() && Strings.isNotBlank(hostName)) {
- return kubernetesClient.pods().withName(hostName).get();
- }
- } catch (final Throwable t) {
- LOGGER.debug("Unable to locate pod with name {}.", hostName);
- }
- return null;
- }
-
- private boolean isServiceAccount() {
- return Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_TOKEN_PATH).toFile().exists()
- && Paths.get(Config.KUBERNETES_SERVICE_ACCOUNT_CA_CRT_PATH).toFile().exists();
- }
-
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
deleted file mode 100644
index 52901ecfdb..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/controller/SampleController.java
+++ /dev/null
@@ -1,125 +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.spring.cloud.config.sample.controller;
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.ThreadContext;
-import org.apache.logging.log4j.core.util.UuidUtil;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-import org.apache.logging.log4j.util.Timer;
-
-
-
-@RestController
-public class SampleController {
-
- private static final Logger LOGGER = LogManager.getLogger(SampleController.class);
- private static int MAX_MESSAGES = 100000;
-
- @GetMapping("/log")
- public ResponseEntity<String> get(@RequestParam(name="threads", defaultValue="1") int threads,
- @RequestParam(name="messages", defaultValue="100000") int count) {
- if (threads < 1) {
- threads = 1;
- }
- if (count < threads) {
- count = threads * 10000;
- }
- if ((count * threads) > MAX_MESSAGES) {
- count = MAX_MESSAGES / threads;
- }
- String msg = "";
- if (threads == 1) {
- ThreadContext.put("requestId", UuidUtil.getTimeBasedUuid().toString());
- final Timer timer = new Timer("sample");
- timer.start();
- for (int n = 0; n < count; ++n) {
- LOGGER.info("Log record " + n);
- }
- timer.stop();
- final StringBuilder sb = new StringBuilder("Elapsed time = ");
- timer.formatTo(sb);
- msg = sb.toString();
- ThreadContext.clearMap();
- } else {
- final ExecutorService service = Executors.newFixedThreadPool(threads);
- final Timer timer = new Timer("sample");
- timer.start();
- for (int i = 0; i < threads; ++i) {
- service.submit(new Worker(i, count));
- }
- service.shutdown();
- try {
- service.awaitTermination(2, TimeUnit.MINUTES);
- timer.stop();
- final StringBuilder sb = new StringBuilder("Elapsed time = ");
- timer.formatTo(sb);
- msg = sb.toString();
- } catch (final InterruptedException ex) {
- msg = "Max time exceeded";
- }
- }
-
- return ResponseEntity.ok(msg);
- }
-
- @GetMapping("/exception")
- public ResponseEntity<String> exception() {
- ThreadContext.put("requestId", UuidUtil.getTimeBasedUuid().toString());
- final Throwable t = new Throwable("This is a test");
- LOGGER.info("This is a test", t);
- final ByteArrayOutputStream os = new ByteArrayOutputStream();
- final PrintStream ps = new PrintStream(os);
- t.printStackTrace(ps);
- String stackTrace = os.toString();
- stackTrace = stackTrace.replaceAll("\n", "<br>");
- ThreadContext.clearMap();
-
- //LOGGER.info("Hello, World");
- return ResponseEntity.ok(stackTrace);
- }
-
- private static class Worker implements Runnable {
-
- private final int id;
- private final int count;
-
- public Worker(final int id, final int count) {
- this.id = id;
- this.count = count;
- }
-
- public void run() {
- final String prefix = "Thread " + id + " record ";
- ThreadContext.put("requestId", UuidUtil.getTimeBasedUuid().toString());
- for (int i = 0; i < count; ++i) {
- LOGGER.info(prefix + i);
- }
- ThreadContext.clearMap();
- }
- }
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java
deleted file mode 100644
index b81c03ce32..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/utils/spring/SampleResponseErrorHandler.java
+++ /dev/null
@@ -1,36 +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.spring.cloud.config.sample.utils.spring;
-
-import java.io.IOException;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.web.client.ResponseErrorHandler;
-
-/**
- * Custom http client error handler which doesn't throw exception in case http code is not 2xx.
- */
-public class SampleResponseErrorHandler implements org.springframework.web.client.ResponseErrorHandler {
- @Override
- public boolean hasError(final ClientHttpResponse clientHttpResponse) throws IOException {
- return false;
- }
-
- @Override
- public void handleError(final ClientHttpResponse clientHttpResponse) throws IOException {
-
- }
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/EnhancedGelf.json b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/EnhancedGelf.json
deleted file mode 100644
index feaf3e02ce..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/EnhancedGelf.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "version": "1.1",
- "host": "${hostName}",
- "short_message": {
- "$resolver": "message",
- "stringified": true
- },
- "full_message": {
- "$resolver": "pattern",
- "pattern": "[%t] %-5p %X{requestId, sessionId, loginId, userId, ipAddress, corpAcctNumber} %C{1.}.%M:%L - %m"
- },
- "timestamp": {
- "$resolver": "timestamp",
- "epoch": {
- "unit": "secs"
- }
- },
- "level": {
- "$resolver": "level",
- "field": "severity",
- "severity": {
- "field": "code"
- }
- },
- "_logger": {
- "$resolver": "logger",
- "field": "name"
- },
- "_thread": {
- "$resolver": "thread",
- "field": "name"
- },
- "_mdc": {
- "$resolver": "mdc",
- "flatten": {
- "prefix": "_"
- },
- "stringified": true
- }
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/META-INF/MANIFEST.MF b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/application.yml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/application.yml
deleted file mode 100644
index 4c6bb12a39..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/application.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-server:
- port: 8080
- servlet:
- context-path: /sample
-
-security:
- basic:
- enabled: false
-
-management:
- security:
- enabled: false
-
-spring:
- application:
- name: sampleapp
-
- cloud:
- bus:
- trace:
- enabled: true
- config:
- watch:
- enabled: true
-
- rabbitmq:
- addresses: rabbit
- port: 5672
- username: guest
- password: guest
-
-log4j2:
- debug: true
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/bootstrap.yml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/bootstrap.yml
deleted file mode 100644
index 102e9417cb..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-#Spring Cloud (Hystrix) config goes here.
-hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 30000
-logging:
- config: http://host.docker.internal:8888/ConfigService/samppleapp/default/master/log4j2.xml
-
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/log4j2.component.properties b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/log4j2.component.properties
deleted file mode 100644
index a4a48cc023..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/resources/log4j2.component.properties
+++ /dev/null
@@ -1,17 +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.
-log4j.configurationFile=http://host.docker.internal:8888/ConfigService/sampleapp/default/master/log4j2.xml
-log4j2.configurationUserName=guest
-log4j2.configurationPassword=guest
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
deleted file mode 100644
index 403869786d..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-spring-cloud-config-samples</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-spring-cloud-config-sample-server</artifactId>
- <packaging>jar</packaging>
-
- <name>Apache Log4j Sample Configuration Service</name>
- <description>Sample Cloud Config Server</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <log4jParentDir>${basedir}/../../..</log4jParentDir>
- <module.name>org.apache.logging.log4j.spring.cloud.config.sample.server</module.name>
-
- <maven.deploy.skip>true</maven.deploy.skip>
-
- <!-- paths -->
- <sonar.dependencyCheck.reportPath>${project.build.directory}/dependency-check-report.xml
- </sonar.dependencyCheck.reportPath>
-
- <!-- maven plugin config -->
- <pmd.failurePriority>2</pmd.failurePriority>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-config-monitor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-config-server</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-bus-amqp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-config</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <!-- here the phase you need -->
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/config-repo</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/config-repo</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <distributionManagement>
- <downloadUrl>https://logging.apache.org/log4j/2.x/download.html</downloadUrl>
- <!-- site is only included to make maven-site-plugin stop complaining -->
- <site>
- <id>www.example.com</id>
- <url>scp://www.example.com/www/docs/project/</url>
- </site>
- </distributionManagement>
-
-</project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/readme.txt b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/readme.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml
deleted file mode 100644
index 955431d290..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<Configuration status="DEBUG" monitorInterval="0">
- <Properties>
- <Property name="spring.application.name">sampleapp</Property>
- </Properties>
- <Appenders>
- <!--<Flume name="flume" ignoreExceptions="false" type="Embedded" compress="false">
- <Property name="channel.type">memory</Property>
- <Property name="channel.capacity">100000</Property>
- <Property name="channel.transactionCapacity">5000</Property>
- <Property name="sinks">agent1</Property>
- <Property name="agent1.type">avro</Property>
- <Property name="agent1.hostname">flume</Property>
- <Property name="agent1.port">5050</Property>
- <Property name="agent1.batch-size">1000</Property>
- <Property name="processor.type">default</Property>
- <JsonLayout properties="true" compact="true" eventEol="true">
- <KeyValuePair key="containerId" value="\${docker:containerId}"/>
- <KeyValuePair key="containerName" value="\${docker:containerName}"/>
- <KeyValuePair key="imageName" value="\${docker:imageName}"/>
- <KeyValuePair key="application" value="\$\${lower:\${spring:spring.application.name}}"/>
- </JsonLayout>
- </Flume>
- <Flume name="avro" ignoreExceptions="false" batchSize="1" compress="false">
- <Agent host="flume" port="5050"/>
- <JsonLayout properties="true" compact="true" eventEol="true" stackTraceAsString="true">
- <KeyValuePair key="containerId" value="\${docker:containerId}"/>
- <KeyValuePair key="containerName" value="\${docker:containerName}"/>
- <KeyValuePair key="imageName" value="\${docker:imageName}"/>
- <KeyValuePair key="application" value="\$\${lower:\${spring:spring.application.name}}"/>
- </JsonLayout>
- </Flume>
- <Flume name="avroSyslog" ignoreExceptions="false" batchSize="100" compress="false">
- <Agent host="flume" port="5050"/>
- <RFC5424Layout enterpriseNumber="18060" includeMDC="true" mdcId="RequestContext" appName="Sample"
- mdcPrefix="">
- <LoggerFields>
- <KeyValuePair key="containerId" value="\${docker:containerId}"/>
- <KeyValuePair key="containerName" value="\${docker:containerName}"/>
- <KeyValuePair key="imageName" value="\${docker:imageName}"/>
- <KeyValuePair key="application" value="\$\${lower:\${spring:spring.application.name}}"/>
- </LoggerFields>
- </RFC5424Layout>
- </Flume>
- <Kafka name="Kafka" topic="log-test" syncSend="false">
- <JsonLayout properties="true" compact="true" eventEol="true">
- <KeyValuePair key="containerId" value="\${docker:containerId}"/>
- <KeyValuePair key="containerName" value="\${docker:containerName}"/>
- <KeyValuePair key="imageName" value="\${docker:imageName}"/>
- <KeyValuePair key="application" value="\$\${lower:\${spring:spring.application.name}}"/>
- </JsonLayout>
- <Property name="bootstrap.servers">host.docker.internal:9092</Property>
- </Kafka>
- <Socket name="fluent-bit" host="fluent-bit" port="24221">
- <JsonLayout properties="true" compact="true" eventEol="true" stackTraceAsString="true">
- <KeyValuePair key="containerId" value="\${docker:containerId}"/>
- <KeyValuePair key="containerName" value="\${docker:containerName}"/>
- <KeyValuePair key="imageName" value="\${docker:imageName}"/>
- <KeyValuePair key="application" value="\$\${lower:\${spring:spring.application.name}}"/>
- </JsonLayout>
- </Socket>
- <RollingFile name="RollingFile" fileName="/var/log/sampleapp/app.log"
- filePattern="/var/log/sampleapp/archive/app.log.%i">
- <JsonLayout properties="true" compact="true" eventEol="true" stackTraceAsString="true">
- <KeyValuePair key="containerId" value="\${docker:containerId}"/>
- <KeyValuePair key="containerName" value="\${docker:containerName}"/>
- <KeyValuePair key="imageName" value="\${docker:imageName}"/>
- <KeyValuePair key="application" value="\$\${lower:\${spring:spring.application.name}}"/>
- </JsonLayout>
- <SizeBasedTriggeringPolicy size="10MB" />
- <DefaultRolloverStrategy max="5"/>
- </RollingFile>
- <RollingFile name="RollingSyslog" fileName="/var/log/sampleapp/syslog.log"
- filePattern="/var/log/sampleapp/archive/syslog.log.%i">
- <RFC5424Layout enterpriseNumber="18060" includeMDC="true" mdcId="RequestContext" appName="Sample"
- mdcPrefix="">
- <LoggerFields>
- <KeyValuePair key="containerId" value="\${docker:containerId}"/>
- <KeyValuePair key="containerName" value="\${docker:containerName}"/>
- <KeyValuePair key="imageName" value="\${docker:imageName}"/>
- <KeyValuePair key="application" value="\$\${lower:\${spring:spring.application.name}}"/>
- </LoggerFields>
- </RFC5424Layout>
- <SizeBasedTriggeringPolicy size="10MB" />
- <DefaultRolloverStrategy max="5"/>
- </RollingFile>-->
- <!--<Socket name="Elastic"
- host="\${sys:logstash.search.host}"
- port="12222"
- protocol="tcp"
- bufferedIo="true">
- <JsonTemplateLayout eventTemplateUri="classpath:EnhancedGelf.json" nullEventDelimiterEnabled="true">
- <EventTemplateAdditionalField key="containerId" value="\${docker:containerId:-}"/>
- <EventTemplateAdditionalField key="application" value="\${lower:${spring:spring.application.name:-spring}}"/>
- <EventTemplateAdditionalField key="kubernetes.serviceAccountName" value="\${k8s:accountName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.containerId" value="\${k8s:containerId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.containerName" value="\${k8s:containerName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.host" value="\${k8s:host:-}"/>
- <EventTemplateAdditionalField key="kubernetes.labels.app" value="\${k8s:labels.app:-}"/>
- <EventTemplateAdditionalField key="kubernetes.labels.pod-template-hash" value="\${k8s:labels.podTemplateHash:-}"/>
- <EventTemplateAdditionalField key="kubernetes.master_url" value="\${k8s:masterUrl:-}"/>
- <EventTemplateAdditionalField key="kubernetes.namespaceId" value="\${k8s:namespaceId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.namespaceName" value="\${k8s:namespaceName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.podID" value="\${k8s:podId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.podIP" value="\${k8s:podIp:-}"/>
- <EventTemplateAdditionalField key="kubernetes.podName" value="\${k8s:podName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.imageId" value="\${k8s:imageId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.imageName" value="\${k8s:imageName:-}"/>
- </JsonTemplateLayout>
- </Socket> -->
- <Socket name="Elastic" host="\${sys:logstash.search.host:-localhost}" port="12222" protocol="tcp" bufferedIo="true" ignoreExceptions="false">
- <GelfLayout includeStackTrace="true" host="${hostName}" includeThreadContext="true" includeNullDelimiter="true"
- compressionType="OFF">
- <ThreadContextIncludes>requestId,sessionId,loginId,userId,ipAddress,corpAcctNumber,callingHost,ohBehalfOf,onBehalfOfAccount</ThreadContextIncludes>
- <MessagePattern>[%t] %-5p %X{requestId, sessionId, loginId, userId, ipAddress, corpAcctNumber} %C{1.}.%M:%L - %m%n</MessagePattern>
- <KeyValuePair key="docker.containerId" value="\${docker:containerId:-}"/>
- <KeyValuePair key="application" value="$\${lower:\${spring:spring.application.name}}"/>
- <KeyValuePair key="kubernetes.serviceAccountName" value="\${k8s:accountName:-}"/>
- <KeyValuePair key="kubernetes.containerId" value="\${k8s:containerId:-}"/>
- <KeyValuePair key="kubernetes.containerName" value="\${k8s:containerName:-}"/>
- <KeyValuePair key="kubernetes.host" value="\${k8s:host:-}"/>
- <KeyValuePair key="kubernetes.labels.app" value="\${k8s:labels.app:-}"/>
- <KeyValuePair key="kubernetes.labels.pod-template-hash" value="\${k8s:labels.podTemplateHash:-}"/>
- <KeyValuePair key="kubernetes.master_url" value="\${k8s:masterUrl:-}"/>
- <KeyValuePair key="kubernetes.namespaceId" value="\${k8s:namespaceId:-}"/>
- <KeyValuePair key="kubernetes.namespaceName" value="\${k8s:namespaceName:-}"/>
- <KeyValuePair key="kubernetes.podID" value="\${k8s:podId:-}"/>
- <KeyValuePair key="kubernetes.podIP" value="\${k8s:podIp:-}"/>
- <KeyValuePair key="kubernetes.podName" value="\${k8s:podName:-}"/>
- <KeyValuePair key="kubernetes.imageId" value="\${k8s:imageId:-}"/>
- <KeyValuePair key="kubernetes.imageName" value="\${k8s:imageName:-}"/>
- </GelfLayout>
- </Socket>
- <Console name="Console" target="SYSTEM_OUT">
- <RFC5424Layout enterpriseNumber="50177" includeMDC="true" mdcId="RequestContext" appName="SalesforceGateway"
- mdcPrefix="" newLine="true" mdcIncludes="requestId,sessionId,loginId,userId,ipAddress,corpAcctNumber"/>
- </Console>
- <Failover name="log4j" primary="Elastic">
- <Failovers>
- <AppenderRef ref="Console"/>
- </Failovers>
- </Failover>
- </Appenders>
-
- <Loggers>
- <Logger name="org.apache.kafka" level="warn" additivity="false">
- <AppenderRef ref="log4j"/>
- </Logger>
- <Logger name="org.apache.flume" level="warn" additivity="false">
- <AppenderRef ref="log4j"/>
- </Logger>
- <Logger name="org.apache.avro" level="warn" additivity="false">
- <AppenderRef ref="log4j"/>
- </Logger>
- <Root level="DEBUG">
- <AppenderRef ref="log4j"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplication.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplication.java
deleted file mode 100644
index 8bf2944e62..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplication.java
+++ /dev/null
@@ -1,29 +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.spring.cloud.config.service;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.config.server.EnableConfigServer;
-
-@EnableConfigServer
-@SpringBootApplication
-public class ConfigServiceApplication {
- public static void main(final String[] args) {
- SpringApplication.run(ConfigServiceApplication.class, args);
- }
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java
deleted file mode 100644
index 62035bd5a6..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/java/org/apache/logging/log4j/spring/cloud/config/service/config/SecurityConfiguration.java
+++ /dev/null
@@ -1,37 +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.spring.cloud.config.service.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-/**
- *
- */
-@Configuration
-@EnableWebSecurity
-public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
- @Override
- public void configure(final WebSecurity web) throws Exception {
- web.ignoring().antMatchers("/health")
- .antMatchers("/metrics")
- .antMatchers("/info");
- getHttp().csrf().disable();
- }
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/application.yaml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/application.yaml
deleted file mode 100644
index b559127d5e..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/application.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-spring:
- cloud:
- bus:
- enabled: true
- config:
- server:
-# git:
-# uri:
-# searchPaths: "{application},{application}/{profile}"
- native:
- searchLocations: file:///${user.dir}/config-repo,file:///${user.dir}/config-repo/{application},file:///${user.dir}/config-repo/{application}/{profile}
-
- security:
- user:
- name: guest
- password: guest
-
- rabbitmq:
- addresses: localhost
- port: 5672
- username: guest
- password: guest
-
- profiles:
- active: native
-
-server:
- port: 8888
-
- servlet:
- context-path: /ConfigService
-
-management:
- endpoints:
- web:
- base-path: /
- exposure:
- include: health, info, refresh
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/log4j2.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/log4j2.xml
deleted file mode 100644
index 0954996021..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<Configuration status="WARN" name="ConfigService">
- <Appenders>
- <Console name="STDOUT">
- <PatternLayout pattern="%d %-5level [%t][%logger]%notEmpty{[%markerSimpleName]} %msg%n%xThrowable" />
- </Console>
- </Appenders>
- <Loggers>
- <Root level="INFO">
- <AppenderRef ref="STDOUT" />
- </Root>
- </Loggers>
-</Configuration>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java
deleted file mode 100644
index 011366fd9d..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/test/java/org/apache/logging/log4j/spring/cloud/config/service/ConfigServiceApplicationTest.java
+++ /dev/null
@@ -1,32 +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.spring.cloud.config.service;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class ConfigServiceApplicationTest {
-
- @Test
- public void contextLoads() {
- }
-
-}
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
deleted file mode 100644
index dbb18da32e..0000000000
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-spring-cloud-config</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.logging.log4j.samples</groupId>
- <artifactId>log4j-spring-cloud-config-samples</artifactId>
- <packaging>pom</packaging>
- <name>Apache Log4j Spring Cloud Config Samples</name>
- <url>http://maven.apache.org</url>
- <properties>
- <log4jParentDir>${basedir}/../..</log4jParentDir>
- <maven.deploy.skip>true</maven.deploy.skip>
- <spring-ws.version>4.0.0</spring-ws.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.ws</groupId>
- <artifactId>spring-ws-core</artifactId>
- <version>${spring-ws.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <modules>
- <module>log4j-spring-cloud-config-sample-application</module>
- <module>log4j-spring-cloud-config-sample-server</module>
- </modules>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
-
- <plugin>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
-
- <!-- `enforce-upper-bound-deps` enforcer using `requireUpperBoundDeps` directive has been of no help so far.
- It is a source of compilation errors that have nothing much to do with Log4j.
- Hence, disabling it for samples: -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-upper-bound-deps</id>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 664bacd3ae..6639a99c15 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -59,6 +59,5 @@
</dependencyManagement>
<modules>
<module>log4j-spring-cloud-config-client</module>
- <module>log4j-spring-cloud-config-samples</module>
</modules>
</project>
diff --git a/pom.xml b/pom.xml
index af671cdbb1..a90b24f05a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1856,7 +1856,6 @@
<module>log4j-plugin-processor</module>
<module>log4j-plugins</module>
<module>log4j-plugins-test</module>
- <module>log4j-samples</module>
<module>log4j-script</module>
<module>log4j-slf4j2-impl</module>
<module>log4j-slf4j-impl</module>
[logging-log4j2] 02/02: Remove managed dependencies: `guava` and `jna`
Posted by pk...@apache.org.
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-log4j2.git
commit f43f995b276ef48c69734e0a2c5d436e556213ee
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Sat Feb 18 00:54:03 2023 +0100
Remove managed dependencies: `guava` and `jna`
Without Log4j Samples, these transitive dependencies do not need to be
managed by us.
---
pom.xml | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index a90b24f05a..27adb18baa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,7 +362,6 @@
<jetty.version>9.4.50.v20221201</jetty.version>
<jmdns.version>3.5.8</jmdns.version>
<jmh.version>1.36</jmh.version>
- <jna.version>5.12.1</jna.version>
<json-unit.version>2.36.0</json-unit.version>
<junit.version>4.13.2</junit.version>
<junit-jupiter.version>5.9.1</junit-jupiter.version>
@@ -728,12 +727,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
<dependency>
<groupId>com.google.guava</groupId>
<!-- https://javadoc.io/doc/com.google.guava/guava-testlib/latest/com/google/common/testing/TestLogHandler.html used in log4j-to-jul tests -->
@@ -917,12 +910,6 @@
<version>${jmh.version}</version>
</dependency>
- <dependency>
- <groupId>net.java.dev.jna</groupId>
- <artifactId>jna</artifactId>
- <version>${jna.version}</version>
- </dependency>
-
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit</artifactId>