Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 46 additions & 73 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>io.s4</groupId>
<artifactId>s4_core</artifactId>

<parent>
<groupId>io.s4</groupId>
<artifactId>s4.parent</artifactId>
<version>0.2.1.0</version>
</parent>

<artifactId>s4.core</artifactId>
<packaging>jar</packaging>
<version>0.2.1.0</version>
<name>s4_core</name>
<url>http://maven.apache.org</url>
<name>${project.artifactId}</name>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/s4/core/issues/</url>
</issueManagement>

<scm>
<connection>scm:git:https://github.com/s4/core.git</connection>
</scm>

<dependencies>
<dependency>
<groupId>org.apache.bcel</groupId>
Expand Down Expand Up @@ -44,53 +58,20 @@
<version>1.2</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
<exclusions>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>javax.jms</groupId>
<artifactId>jms</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jdmk</groupId>
<artifactId>jmxtools</artifactId>
</exclusion>
<exclusion>
<groupId>com.sun.jmx</groupId>
<artifactId>jmxri</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>commons-jexl</groupId>
<groupId>org.apache.commons</groupId>
<artifactId>commons-jexl</artifactId>
<version>1.1</version>
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>avro</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>io.s4.comm</groupId>
<artifactId>comm</artifactId>
<groupId>io.s4</groupId>
<artifactId>s4.comm</artifactId>
<version>0.2.1.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
Expand Down Expand Up @@ -125,31 +106,23 @@
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<ignoreDirFormatExtensions>false</ignoreDirFormatExtensions>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
<threshold>High</threshold>
</configuration>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
<threshold>High</threshold>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -161,15 +134,15 @@
<artifactId>doxia-module-confluence</artifactId>
<version>1.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-twiki</artifactId>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-twiki</artifactId>
<version>1.1.3</version>
</dependency>
</dependencies>
<configuration>
<siteDirectory>target/generated-site</siteDirectory>
</configuration>
</dependencies>
<configuration>
<siteDirectory>target/generated-site</siteDirectory>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
54 changes: 25 additions & 29 deletions src/main/resources/log4j.xml
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="R" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="${log_loc}/s4_core/s4_core_${instanceId}.log" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %c %p (%F:%L) %m%n" />
</layout>
</appender>
<appender name="S" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="${log_loc}/s4_core/s4_core_${instanceId}.mon" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %c %p (%F:%L) %m%n" />
</layout>
</appender>
<logger name="com.yahoo" additivity="false">
<level value="info"/>
<appender-ref ref="R"/>
<level value="info" />
<appender-ref ref="R" />
</logger>
<logger name="s4" additivity="false">
<level value="info"/>
<appender-ref ref="R"/>
<level value="info" />
<appender-ref ref="R" />
</logger>
<logger name="zk" additivity="false">
<level value="info"/>
<appender-ref ref="R"/>
<level value="info" />
<appender-ref ref="R" />
</logger>
<logger name="dispatcher" additivity="false">
<level value="info"/>
<appender-ref ref="R"/>
<level value="info" />
<appender-ref ref="R" />
</logger>
<logger name="monitor">
<level value="info"/>
<appender-ref ref="S"/>
<level value="info" />
<appender-ref ref="S" />
</logger>
<appender name="R" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="${log_loc}/s4_core/s4_core_${instanceId}.log" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %c %p (%F:%L) %m%n"/>
</layout>
</appender>
<appender name="S" class="org.apache.log4j.DailyRollingFileAppender">
<param name="File" value="${log_loc}/s4_core/s4_core_${instanceId}.mon" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%d %c %p (%F:%L) %m%n"/>
</layout>
</appender>
<root>
<priority value ="info" />
<appender-ref ref="R" />
<root>
<priority value="info" />
<appender-ref ref="R" />
</root>
</log4j:configuration>