From c0043b877705094c17104d5d232744a92d809dc6 Mon Sep 17 00:00:00 2001
From: Sandy Ryza <sandy@cloudera.com>
Date: Fri, 4 Apr 2014 12:42:39 -0700
Subject: [PATCH] Put log4j.properties file under common

---
 .../log4j-spark-container.properties          |  0
 yarn/pom.xml                                  |  6 +++++
 .../log4j-spark-container.properties          | 24 -------------------
 3 files changed, 6 insertions(+), 24 deletions(-)
 rename yarn/{alpha => common}/src/main/resources/log4j-spark-container.properties (100%)
 delete mode 100644 yarn/stable/src/main/resources/log4j-spark-container.properties

diff --git a/yarn/alpha/src/main/resources/log4j-spark-container.properties b/yarn/common/src/main/resources/log4j-spark-container.properties
similarity index 100%
rename from yarn/alpha/src/main/resources/log4j-spark-container.properties
rename to yarn/common/src/main/resources/log4j-spark-container.properties
diff --git a/yarn/pom.xml b/yarn/pom.xml
index 35e31760c1f02..3342cb65edcd1 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -167,6 +167,12 @@
 
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
     <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
+  
+    <resources>
+      <resource>
+        <directory>../common/src/main/resources</directory>
+      </resource>
+    </resources>
   </build>
 
 </project>
diff --git a/yarn/stable/src/main/resources/log4j-spark-container.properties b/yarn/stable/src/main/resources/log4j-spark-container.properties
deleted file mode 100644
index a1e37a0be27dd..0000000000000
--- a/yarn/stable/src/main/resources/log4j-spark-container.properties
+++ /dev/null
@@ -1,24 +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. See accompanying LICENSE file.
-
-# Set everything to be logged to the console
-log4j.rootCategory=INFO, console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{1}: %m%n
-
-# Settings to quiet third party logs that are too verbose
-log4j.logger.org.eclipse.jetty=WARN
-log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
-log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO