You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2022/01/20 22:28:32 UTC
[logging-log4j2] 01/02: Normalize Apache license headers for XML test fixtures.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 6d44d78ab519ab4c85366c36ba78378607df7036
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 20 16:43:33 2022 -0500
Normalize Apache license headers for XML test fixtures.
---
.../test/resources/config-1.2/log4j-capitalization.xml | 16 ++++++++++++++++
.../resources/config-1.2/log4j-console-TTCCLayout.xml | 16 ++++++++++++++++
log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml | 1 -
.../test/resources/log4j1-1.2.17/input/xml/DOMTest4.xml | 1 -
.../log4j1-1.2.17/input/xml/SocketAppenderTestConfig.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/customLevel2.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/customLevel3.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/customLevel4.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/customLogger1.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/customLogger2.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/customLogger3.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/defaultInit.xml | 1 -
.../test/resources/log4j1-1.2.17/input/xml/fallback1.xml | 1 -
.../resources/log4j1-1.2.17/input/xml/smtpAppender1.xml | 1 -
log4j-1.2-api/src/test/resources/log4j2-config.xml | 1 -
log4j-1.2-api/src/test/resources/logWithMDC.xml | 1 -
16 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/log4j-1.2-api/src/test/resources/config-1.2/log4j-capitalization.xml b/log4j-1.2-api/src/test/resources/config-1.2/log4j-capitalization.xml
index 0770db0..c353fe0 100644
--- a/log4j-1.2-api/src/test/resources/config-1.2/log4j-capitalization.xml
+++ b/log4j-1.2-api/src/test/resources/config-1.2/log4j-capitalization.xml
@@ -1,4 +1,20 @@
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!--
+ 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:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="ConsoleCapitalized" class="org.apache.log4j.ConsoleAppender">
<param name="Encoding" value="ISO-8859-1" />
diff --git a/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-TTCCLayout.xml b/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-TTCCLayout.xml
index c900c7b..0de8052 100644
--- a/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-TTCCLayout.xml
+++ b/log4j-1.2-api/src/test/resources/config-1.2/log4j-console-TTCCLayout.xml
@@ -1,4 +1,20 @@
<?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.
+-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="Console" class="org.apache.log4j.ConsoleAppender">
diff --git a/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml b/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
index eb7e8a5..17a263f 100644
--- a/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
+++ b/log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
@@ -14,7 +14,6 @@
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="ConfigTest" status="error" packages="org.apache.logging.log4j.test"
monitorInterval="5">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/DOMTest4.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/DOMTest4.xml
index 91aab08..b4535e2 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/DOMTest4.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/DOMTest4.xml
@@ -19,7 +19,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
&a1;
&a2;
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/SocketAppenderTestConfig.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/SocketAppenderTestConfig.xml
index 2930b7b..8588e7f 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/SocketAppenderTestConfig.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/SocketAppenderTestConfig.xml
@@ -14,7 +14,6 @@
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.
-
-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel2.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel2.xml
index fdc0be1..8873580 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel2.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel2.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel3.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel3.xml
index 8e4b626..f8c014a 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel3.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel3.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel4.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel4.xml
index 0ae0b75..e1bd0de 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel4.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLevel4.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration debug="true"
xmlns:log4j='http://jakarta.apache.org/log4j/'>
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger1.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger1.xml
index 3a09151..7ccb8bd 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger1.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger1.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="false">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger2.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger2.xml
index 3a33f5c..7065aac 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger2.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger2.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="true">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger3.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger3.xml
index 000a1b9..02c7e9f 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger3.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/customLogger3.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'
debug="true">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/defaultInit.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/defaultInit.xml
index 71bfbea..62da4c1 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/defaultInit.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/defaultInit.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration debug="true" xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="D1" class="org.apache.log4j.ConsoleAppender">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/fallback1.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/fallback1.xml
index 5eb42c4..dc542df 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/fallback1.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/fallback1.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration debug="true" xmlns:log4j="http://jakarta.apache.org/log4j/">
diff --git a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/smtpAppender1.xml b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/smtpAppender1.xml
index c1aebdf..1df1a91 100644
--- a/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/smtpAppender1.xml
+++ b/log4j-1.2-api/src/test/resources/log4j1-1.2.17/input/xml/smtpAppender1.xml
@@ -16,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="A1" class="org.apache.log4j.net.SMTPAppender">
diff --git a/log4j-1.2-api/src/test/resources/log4j2-config.xml b/log4j-1.2-api/src/test/resources/log4j2-config.xml
index 2427af8..11040d3 100644
--- a/log4j-1.2-api/src/test/resources/log4j2-config.xml
+++ b/log4j-1.2-api/src/test/resources/log4j2-config.xml
@@ -14,7 +14,6 @@
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="ConfigTest" status="error" packages="org.apache.logging.log4j.test"
monitorInterval="5">
diff --git a/log4j-1.2-api/src/test/resources/logWithMDC.xml b/log4j-1.2-api/src/test/resources/logWithMDC.xml
index e3acee1..97f3b86 100644
--- a/log4j-1.2-api/src/test/resources/logWithMDC.xml
+++ b/log4j-1.2-api/src/test/resources/logWithMDC.xml
@@ -14,7 +14,6 @@
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="ConfigTest" status="error" packages="org.apache.logging.log4j.test"
monitorInterval="5">