You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/09/30 07:34:14 UTC
git commit: Update copyright header.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 9a6183550 -> 2020b274e
Update copyright header.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2020b274
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2020b274
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2020b274
Branch: refs/heads/master
Commit: 2020b274e570d033d6581e445a30e4ef086d5c84
Parents: 9a61835
Author: Matt Sicker <ma...@apache.org>
Authored: Tue Sep 30 00:34:03 2014 -0500
Committer: Matt Sicker <ma...@apache.org>
Committed: Tue Sep 30 00:34:03 2014 -0500
----------------------------------------------------------------------
log4j-bom/pom.xml | 16 ++++++++++++
.../log4j/core/config/OrderComparator.java | 16 ++++++++++++
.../lookup/JmxRuntimeInputArgumentsLookup.java | 16 ++++++++++++
.../javax.annotation.processing.Processor | 16 ++++++++++++
.../org.apache.commons.logging.LogFactory | 18 +++++++++++++-
.../src/main/resources/perf-log4j12-async.xml | 26 ++++++++++++++++----
.../src/main/resources/perf-logback-async.xml | 18 +++++++++++++-
.../src/main/resources/perf3PlainNoLoc.xml | 16 ++++++++++++
.../src/main/resources/perf5AsyncApndNoLoc.xml | 18 +++++++++++++-
.../javax.servlet.ServletContainerInitializer | 18 +++++++++++++-
10 files changed, 169 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-bom/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 2896a57..f2eb6f8 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.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.
+ -->
<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">
<parent>
<groupId>org.apache</groupId>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
index e9fce18..94b45ad 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/OrderComparator.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
package org.apache.logging.log4j.core.config;
import java.util.Comparator;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
index 8f59b0f..3dc2e5d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JmxRuntimeInputArgumentsLookup.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
package org.apache.logging.log4j.core.lookup;
import java.lang.management.ManagementFactory;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/log4j-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor
index 32e00fd..bb9dcb9 100644
--- a/log4j-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ b/log4j-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -1 +1,17 @@
+#
+# 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.
+#
org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-jcl/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory
----------------------------------------------------------------------
diff --git a/log4j-jcl/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory b/log4j-jcl/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory
index a20a589..f523dfe 100644
--- a/log4j-jcl/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory
+++ b/log4j-jcl/src/main/resources/META-INF/services/org.apache.commons.logging.LogFactory
@@ -1 +1,17 @@
-org.apache.logging.log4j.jcl.LogFactoryImpl
\ No newline at end of file
+#
+# 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.
+#
+org.apache.logging.log4j.jcl.LogFactoryImpl
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-perf/src/main/resources/perf-log4j12-async.xml
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/resources/perf-log4j12-async.xml b/log4j-perf/src/main/resources/perf-log4j12-async.xml
index 76a5d76..f422551 100644
--- a/log4j-perf/src/main/resources/perf-log4j12-async.xml
+++ b/log4j-perf/src/main/resources/perf-log4j12-async.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="File" class="org.apache.log4j.FileAppender">
@@ -7,14 +23,14 @@
<param name="Append" value="false" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %p %c{1} [%t] %X{aKey} %m %n"/>
- </layout>
+ </layout>
</appender>
<appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
<param name="BufferSize" value="262144"/>
<appender-ref ref="File"/>
</appender>
- <root>
- <priority value="debug" />
- <appender-ref ref="ASYNC" />
+ <root>
+ <priority value="debug" />
+ <appender-ref ref="ASYNC" />
</root>
-</log4j:configuration>
\ No newline at end of file
+</log4j:configuration>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-perf/src/main/resources/perf-logback-async.xml
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/resources/perf-logback-async.xml b/log4j-perf/src/main/resources/perf-logback-async.xml
index aba731f..5468390 100644
--- a/log4j-perf/src/main/resources/perf-logback-async.xml
+++ b/log4j-perf/src/main/resources/perf-logback-async.xml
@@ -1,3 +1,19 @@
+<!--
+ 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>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
@@ -18,4 +34,4 @@
<root level="debug">
<appender-ref ref="ASYNC" />
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-perf/src/main/resources/perf3PlainNoLoc.xml
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/resources/perf3PlainNoLoc.xml b/log4j-perf/src/main/resources/perf3PlainNoLoc.xml
index 9fa3a2c..52ab7ad 100644
--- a/log4j-perf/src/main/resources/perf3PlainNoLoc.xml
+++ b/log4j-perf/src/main/resources/perf3PlainNoLoc.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.
+ -->
<Configuration status="OFF">
<Appenders>
<RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-perf/src/main/resources/perf5AsyncApndNoLoc.xml
----------------------------------------------------------------------
diff --git a/log4j-perf/src/main/resources/perf5AsyncApndNoLoc.xml b/log4j-perf/src/main/resources/perf5AsyncApndNoLoc.xml
index 3be882f..8ab90b8 100644
--- a/log4j-perf/src/main/resources/perf5AsyncApndNoLoc.xml
+++ b/log4j-perf/src/main/resources/perf5AsyncApndNoLoc.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.
+ -->
<Configuration status="OFF">
<Appenders>
<RandomAccessFile name="RandomAccessFile" fileName="perftest.log" immediateFlush="false" append="false">
@@ -9,7 +25,7 @@
<Async name="Async" blocking="true" bufferSize="262144">
<appender-ref ref="RandomAccessFile"/>
</Async>
- </Appenders>
+ </Appenders>
<Loggers>
<Root level="info" includeLocation="false">
<appender-ref ref="Async"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2020b274/log4j-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
----------------------------------------------------------------------
diff --git a/log4j-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer b/log4j-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
index fa243bc..1313844 100644
--- a/log4j-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
+++ b/log4j-web/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
@@ -1 +1,17 @@
-org.apache.logging.log4j.web.Log4jServletContainerInitializer
\ No newline at end of file
+#
+# 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.
+#
+org.apache.logging.log4j.web.Log4jServletContainerInitializer