You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/07/02 18:14:05 UTC
[3/3] falcon git commit: FALCON-1300 Use xml instead of properties
for log4j. Contributed by Raghav Kumar Gautam
FALCON-1300 Use xml instead of properties for log4j. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/867a24a6
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/867a24a6
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/867a24a6
Branch: refs/heads/master
Commit: 867a24a6a8c69560a69c771678864adfaf8bf399
Parents: 3b4610a
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Thu Jul 2 19:11:56 2015 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Thu Jul 2 19:11:56 2015 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../merlin/src/test/resources/log4j.properties | 22 ------------
.../merlin/src/test/resources/log4j.xml | 36 ++++++++++++++++++++
3 files changed, 38 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/867a24a6/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index e5ffcfb..8c65450 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -355,6 +355,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-1300 Use xml instead of properties for log4j (Raghav Kumar Gautam via Ruslan Ostafiychuk)
+
FALCON-1290 Push Enter in start/end filter on entity page, start instance is included (Ruslan Ostafiychuk)
FALCON-1289 Select instances again after performing action on entity page (Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/867a24a6/falcon-regression/merlin/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/log4j.properties b/falcon-regression/merlin/src/test/resources/log4j.properties
deleted file mode 100644
index 6e4eb1b..0000000
--- a/falcon-regression/merlin/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-#Licensed 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.
-
-#root logger
-log4j.rootLogger=INFO, stderr
-
-# configure stderr
-log4j.appender.stderr = org.apache.log4j.ConsoleAppender
-log4j.appender.stderr.Threshold = DEBUG
-log4j.appender.stderr.Target = System.err
-log4j.appender.stderr.layout = org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern = %d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n
http://git-wip-us.apache.org/repos/asf/falcon/blob/867a24a6/falcon-regression/merlin/src/test/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/resources/log4j.xml b/falcon-regression/merlin/src/test/resources/log4j.xml
new file mode 100644
index 0000000..e5dd219
--- /dev/null
+++ b/falcon-regression/merlin/src/test/resources/log4j.xml
@@ -0,0 +1,36 @@
+<?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="stderr" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.err"/>
+ <param name="Threshold" value="DEBUG"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
+ </layout>
+ </appender>
+
+ <root>
+ <priority value="info"/>
+ <appender-ref ref="stderr"/>
+ </root>
+
+</log4j:configuration>
\ No newline at end of file