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 2015/08/09 06:13:26 UTC
[1/2] logging-log4j2 git commit: Add license headers
Repository: logging-log4j2
Updated Branches:
refs/heads/master 62b47cb51 -> 1454587f6
Add 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/416477fb
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/416477fb
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/416477fb
Branch: refs/heads/master
Commit: 416477fb5084fab76a951be7166803305b4d6cb4
Parents: bfd7382
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Aug 8 21:12:20 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Aug 8 21:12:20 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/util/datetime/Format.java | 18 +++++++++++++++++-
.../log4j/configuration/CustomConfiguration.java | 16 ++++++++++++++++
.../configuration/CustomConfigurationFactory.java | 16 ++++++++++++++++
.../configuration/CustomConfigurationTest.java | 16 ++++++++++++++++
4 files changed, 65 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/416477fb/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java
index f207bb2..a4a2f69 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/Format.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.util.datetime;
import java.text.FieldPosition;
@@ -5,7 +21,7 @@ import java.text.ParseException;
import java.text.ParsePosition;
/**
- *
+ * The basic methods for performing date formatting.
*/
public abstract class Format {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/416477fb/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
index 9011a8e..0dd4345 100644
--- a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.java
+++ b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfiguration.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.configuration;
import org.apache.logging.log4j.Level;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/416477fb/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java
index 36d54d3..3c59b34 100644
--- a/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.java
+++ b/log4j-samples/configuration/src/main/java/org/apache/logging/log4j/configuration/CustomConfigurationFactory.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.configuration;
import org.apache.logging.log4j.core.config.Configuration;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/416477fb/log4j-samples/configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-samples/configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java b/log4j-samples/configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java
index e63d7f7..22e37ef 100644
--- a/log4j-samples/configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.java
+++ b/log4j-samples/configuration/src/test/java/org/apache/logging/log4j/configuration/CustomConfigurationTest.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.configuration;
import org.apache.logging.log4j.LogManager;
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2
Posted by rg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1454587f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1454587f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1454587f
Branch: refs/heads/master
Commit: 1454587f6bd07fbf6f13185fdb170d4fc6a01e7e
Parents: 416477f 62b47cb
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Aug 8 21:12:30 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Aug 8 21:12:30 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/Configuration.java | 7 ++
.../logging/log4j/core/config/Configurator.java | 121 ++++++++++++-------
.../apache/logging/log4j/core/LoggerTest.java | 14 +++
src/changes/changes.xml | 3 +
src/site/xdoc/faq.xml | 12 ++
5 files changed, 111 insertions(+), 46 deletions(-)
----------------------------------------------------------------------