You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2016/04/26 15:48:47 UTC
logging-log4j2 git commit: Add missing or incorrect license headers
Repository: logging-log4j2
Updated Branches:
refs/heads/master 91aba0063 -> 5b680acbc
Add missing or incorrect license headers
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5b680acb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5b680acb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5b680acb
Branch: refs/heads/master
Commit: 5b680acbcd718fd87e1f142d434010f3edfc1809
Parents: 91aba00
Author: Ralph Goers <rg...@nextiva.com>
Authored: Tue Apr 26 06:48:34 2016 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Tue Apr 26 06:48:34 2016 -0700
----------------------------------------------------------------------
.../logging/log4j/CloseableThreadContext.java | 26 ++++++++++++++++----
.../apache/logging/log4j/spi/Terminable.java | 16 ++++++++++--
.../log4j/CloseableThreadContextTest.java | 18 +++++++++++++-
3 files changed, 52 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b680acb/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java b/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java
index d84f395..d2f7957 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.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;
import java.util.HashMap;
@@ -8,7 +24,7 @@ import org.apache.logging.log4j.util.Strings;
/**
* Adds entries to the {@link ThreadContext stack or map} and them removes them when the object is closed, e.g. as part
* of a try-with-resources.
- *
+ *
* @since 2.6
*/
public class CloseableThreadContext implements AutoCloseable {
@@ -16,7 +32,7 @@ public class CloseableThreadContext implements AutoCloseable {
/**
* Pushes new diagnostic context information on to the Thread Context Stack. The information will be popped off when
* the instance is closed.
- *
+ *
* @param message
* The new diagnostic context information.
* @return a new instance that will back out the changes when closed.
@@ -28,7 +44,7 @@ public class CloseableThreadContext implements AutoCloseable {
/**
* Pushes new diagnostic context information on to the Thread Context Stack. The information will be popped off when
* the instance is closed.
- *
+ *
* @param message
* The new diagnostic context information.
* @param args
@@ -65,7 +81,7 @@ public class CloseableThreadContext implements AutoCloseable {
/**
* Creates an instance of a {@code CloseableThreadContext} that pushes new diagnostic context information on to the
* Thread Context Stack. The information will be popped off when the instance is closed.
- *
+ *
* @param message
* The new diagnostic context information.
*/
@@ -77,7 +93,7 @@ public class CloseableThreadContext implements AutoCloseable {
/**
* Creates an instance of a {@code CloseableThreadContext} that pushes new diagnostic context information on to the
* Thread Context Stack. The information will be popped off when the instance is closed.
- *
+ *
* @param message
* The new diagnostic context information.
* @param args
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b680acb/log4j-api/src/main/java/org/apache/logging/log4j/spi/Terminable.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Terminable.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Terminable.java
index 1a8abe6..d828231 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Terminable.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Terminable.java
@@ -1,6 +1,18 @@
/*
- * Copyright (c) 2016 Nextiva, Inc. to Present.
- * All rights reserved.
+ * 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.spi;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b680acb/log4j-api/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
index 42ed624..63f3ec8 100644
--- a/log4j-api/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
+++ b/log4j-api/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.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;
import static org.hamcrest.CoreMatchers.is;
@@ -8,7 +24,7 @@ import org.junit.Test;
/**
* Tests {@link CloseableThreadContext}.
- *
+ *
* @since 2.6
*/
public class CloseableThreadContextTest {