11

pom.xml

@@ -190,6 +190,7 @@
					<include>project-dev.properties</include>
					<include>project-test-dev.properties</include>
					<include>project-test.properties</include>
					<include>META-INF/**/*</include>
				</includes>
				<filtering>true</filtering>
			</resource>

src/main/java/com/ekexiu/portal/job/ArticleTaskJobEntry.java

@@ -7,9 +7,10 @@ import java.util.List;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
import org.jfw.util.log.LogFactory;
import org.jfw.util.log.Logger;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.po.Article;
@@ -17,7 +18,7 @@ import com.ekexiu.portal.service.ArticleService;
@Bean
public class ArticleTaskJobEntry implements Runnable {
	private static Logger logger = Logger.getLogger(ArticleTaskJobEntry.class);
	private static Logger logger = LogFactory.getLog(ArticleTaskJobEntry.class);
	private long delayTime = 10 * 60;
	private String dateFormat = "yyyyMMddHHmmss";
	@Autowrie("dataSource")

src/main/java/com/ekexiu/portal/job/ProScoreTaskJobEntry.java

@@ -6,15 +6,16 @@ import java.util.Date;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
import org.jfw.util.log.LogFactory;
import org.jfw.util.log.Logger;
import com.ekexiu.portal.service.ProfessorService;
@Bean
public class ProScoreTaskJobEntry implements Runnable {
	private static Logger logger = Logger.getLogger(ProScoreTaskJobEntry.class);
	private static Logger logger = LogFactory.getLog(ProScoreTaskJobEntry.class);
	private String taskTime;
	private long delayTime;
	@Autowrie("dataSource")

src/main/java/com/ekexiu/portal/job/TaskJobEntry.java

@@ -6,14 +6,15 @@ import java.util.Date;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
import org.jfw.util.log.LogFactory;
import org.jfw.util.log.Logger;
import com.ekexiu.portal.service.ProfessorService;
@Bean
public class TaskJobEntry implements Runnable{
	private static Logger logger = Logger.getLogger(TaskJobEntry.class);
	private static Logger logger = LogFactory.getLog(TaskJobEntry.class);
	private String taskTime;
	private long delayTime;
	@Autowrie("dataSource")

src/main/java/com/ekexiu/portal/service/SysService.java

@@ -12,7 +12,6 @@ import java.util.concurrent.TimeUnit;
import javax.mail.MessagingException;
import org.apache.log4j.Logger;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -26,6 +25,8 @@ import org.jfw.apt.web.annotation.param.SessionVal;
import org.jfw.util.StringUtil;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.log.LogFactory;
import org.jfw.util.log.Logger;
import org.jfw.util.state.StateCode;
import com.ekexiu.portal.dao.OrgDao;
@@ -50,7 +51,7 @@ import com.ekexiu.portal.pojo.SessionUser;
public class SysService {
	public static final String DEFAULT_PASS_WORD = "11111111111111111111111111111111";
	public static SimpleDateFormat DATE = new SimpleDateFormat("yyyyMMddHHmmss");
	private Logger logger = Logger.getLogger(SysService.class);
	private Logger logger = LogFactory.getLog(SysService.class);
	@Autowrie
	private UserDao userDao;

src/main/java/com/ekexiu/portal/util/Log4jLogFactory.java

@@ -0,0 +1,11 @@
package com.ekexiu.portal.util;
import org.jfw.util.log.LogFactory;
import org.jfw.util.log.Logger;
public class Log4jLogFactory extends LogFactory {
	@Override
	public Logger getLogger(Class<?> clazz) {
		return new Log4jLogger(org.apache.log4j.Logger.getLogger(clazz));
	}
}

src/main/java/com/ekexiu/portal/util/Log4jLogger.java

@@ -0,0 +1,93 @@
package com.ekexiu.portal.util;
import org.jfw.util.log.Logger;
public class Log4jLogger implements Logger {
	
	private final org.apache.log4j.Logger log;
	
	 public Log4jLogger(org.apache.log4j.Logger log) {
		 this.log = log;
	 }
	@Override
	public boolean isEnableTrace() {
		return log.isTraceEnabled();
	}
	@Override
	public void trace(String message) {
		log.trace(message);
	}
	@Override
	public void trace(String message, Throwable t) {
		log.trace(message, t);
	}
	@Override
	public boolean isEnableDebug() {
		return log.isDebugEnabled();
	}
	@Override
	public void debug(String message) {
		log.debug(message);		
	}
	@Override
	public void debug(String message, Throwable t) {
		log.debug(message, t);
	}
	@Override
	public boolean isEnableInfo() {
		return log.isInfoEnabled();
	}
	@Override
	public void info(String message) {
		log.info(message);
	}
	@Override
	public void info(String message, Throwable t) {
		log.info(message, t);
	}
	@Override
	public boolean isEnableWarn() {
		return true;
	}
	@Override
	public void warn(String message) {
		log.warn(message);
	}
	@Override
	public void warn(String message, Throwable t) {
		log.warn(message, t);
	}
	@Override
	public void error(String message) {
		log.error(message);
	}
	@Override
	public void error(String message, Throwable t) {
		log.error(message, t);
	}
	@Override
	public void fatal(String message) {
		log.fatal(message);
	}
	@Override
	public void fatal(String message, Throwable t) {
		log.fatal(message, t);
	}
}

src/main/java/com/ekexiu/push/service/PushService.java

@@ -27,6 +27,8 @@ import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.util.ConstData;
import org.jfw.util.io.IoUtil;
import org.jfw.util.json.JsonService;
import org.jfw.util.log.LogFactory;
import org.jfw.util.log.Logger;
import org.jfw.util.reflect.TypeReference;
import com.ekexiu.operation.push.getui.Message;
@@ -36,7 +38,7 @@ import com.ekexiu.operation.push.getui.NotificationMessage;
@Path("/push")
public class PushService {
	private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(PushService.class);
	private static final Logger log =LogFactory.getLog(PushService.class);
	private static Type RES_TYPE = new TypeReference<Map<String, Object>>() {
	}.getType();

src/main/resources/META-INF/services/org.jfw.util.log.LogFactory

@@ -0,0 +1 @@
com.ekexiu.portal.util.Log4jLogFactory