You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by jm...@apache.org on 2015/08/26 22:08:53 UTC
incubator-atlas git commit: ATLAS-115 Remove unnecessary log4j.xml in
typesystem
Repository: incubator-atlas
Updated Branches:
refs/heads/master 2ed767c21 -> 133690f75
ATLAS-115 Remove unnecessary log4j.xml in typesystem
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/133690f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/133690f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/133690f7
Branch: refs/heads/master
Commit: 133690f759f13901c6161666df951134fdf9d519
Parents: 2ed767c
Author: Jon Maron <jm...@hortonworks.com>
Authored: Wed Aug 26 16:08:45 2015 -0400
Committer: Jon Maron <jm...@hortonworks.com>
Committed: Wed Aug 26 16:08:45 2015 -0400
----------------------------------------------------------------------
typesystem/pom.xml | 10 ++++++
typesystem/src/main/resources/log4j.xml | 54 ----------------------------
2 files changed, 10 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/133690f7/typesystem/pom.xml
----------------------------------------------------------------------
diff --git a/typesystem/pom.xml b/typesystem/pom.xml
index 1627d89..e4a1383 100755
--- a/typesystem/pom.xml
+++ b/typesystem/pom.xml
@@ -134,6 +134,16 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <excludes>
+ <exclude>**/log4j.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/133690f7/typesystem/src/main/resources/log4j.xml
----------------------------------------------------------------------
diff --git a/typesystem/src/main/resources/log4j.xml b/typesystem/src/main/resources/log4j.xml
deleted file mode 100755
index 528881a..0000000
--- a/typesystem/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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="console" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %-5p - [%t:%x] ~ %m (%c{1}:%L)%n"/>
- </layout>
- </appender>
-
- <appender name="AUDIT" class="org.apache.log4j.DailyRollingFileAppender">
- <param name="File" value="${user.dir}/target/logs/audit.log"/>
- <param name="Append" value="true"/>
- <param name="Threshold" value="debug"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d %x %m%n"/>
- </layout>
- </appender>
-
- <logger name="AUDIT" additivity="false">
- <level value="debug"/>
- <appender-ref ref="console"/>
- </logger>
-
- <logger name="org.apache.atlas" additivity="false">
- <level value="debug"/>
- <appender-ref ref="console"/>
- </logger>
-
- <root>
- <priority value="warn"/>
- <appender-ref ref="console"/>
- </root>
-
-</log4j:configuration>