Repository: incubator-blur Updated Branches: refs/heads/apache-blur-0.2 c964d85dd -> d383f8157
Removed the default blur-site.properties in blur console only and added a log4j file Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/d383f815 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/d383f815 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/d383f815 Branch: refs/heads/apache-blur-0.2 Commit: d383f8157282d5a780579a63f10c0ac8b6e5e61b Parents: c964d85 Author: Chris Rohr <[email protected]> Authored: Thu Jun 12 15:36:52 2014 -0400 Committer: Chris Rohr <[email protected]> Committed: Thu Jun 12 15:36:52 2014 -0400 ---------------------------------------------------------------------- contrib/blur-console/src/assemble/bin.xml | 5 +++ .../blur-console/src/main/resources/log4j.xml | 35 ++++++++++++++++++++ 2 files changed, 40 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d383f815/contrib/blur-console/src/assemble/bin.xml ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/assemble/bin.xml b/contrib/blur-console/src/assemble/bin.xml index 10b872a..6e3c3ee 100644 --- a/contrib/blur-console/src/assemble/bin.xml +++ b/contrib/blur-console/src/assemble/bin.xml @@ -45,6 +45,11 @@ under the License. <exclude>org.apache.hadoop:hadoop-client</exclude> <exclude>org.apache.hadoop:hadoop-minicluster</exclude> </excludes> + <unpackOptions> + <excludes> + <exclude>**/blur-site.properties</exclude> + </excludes> + </unpackOptions> </dependencySet> </dependencySets> <fileSets> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d383f815/contrib/blur-console/src/main/resources/log4j.xml ---------------------------------------------------------------------- diff --git a/contrib/blur-console/src/main/resources/log4j.xml b/contrib/blur-console/src/main/resources/log4j.xml new file mode 100644 index 0000000..1b86341 --- /dev/null +++ b/contrib/blur-console/src/main/resources/log4j.xml @@ -0,0 +1,35 @@ +<!-- +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. +--> +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";> + <appender name="console" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%-5p %c{1} - %m%n"/> + </layout> + </appender> + + <root> + <priority value ="warn" /> + <appender-ref ref="console" /> + </root> + +</log4j:configuration> \ No newline at end of file
