diff --git a/pom.xml b/pom.xml index 7fc00416f..677b59ae1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.19.0 + 1.20.0 @@ -203,6 +203,34 @@ 3.1.0 provided + + + org.apache.logging.log4j + log4j-core + 2.21.1 + + + org.apache.logging.log4j + log4j-api + 2.21.1 + + + org.apache.logging.log4j + log4j-slf4j-impl + 2.21.1 + test + + + org.apache.logging.log4j + log4j-1.2-api + 2.21.1 + test + + + org.apache.logging.log4j + log4j-jcl + 2.21.1 + diff --git a/src/com/rjconsultores/routing/ReadOnlyConnection.java b/src/com/rjconsultores/routing/ReadOnlyConnection.java index 330e24621..6cd607659 100644 --- a/src/com/rjconsultores/routing/ReadOnlyConnection.java +++ b/src/com/rjconsultores/routing/ReadOnlyConnection.java @@ -1,8 +1,8 @@ package com.rjconsultores.routing; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java b/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java index 474448602..46cd8aa20 100644 --- a/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java +++ b/src/com/rjconsultores/routing/ReadOnlyRouteInterceptor.java @@ -1,6 +1,7 @@ package com.rjconsultores.routing; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -13,7 +14,7 @@ import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; @Component @Order(0) public class ReadOnlyRouteInterceptor { - private static Logger log = Logger.getLogger(ReadOnlyRouteInterceptor.class); + private static final Logger log = LogManager.getLogger(ReadOnlyRouteInterceptor.class); @Around("@annotation(readOnlyConnection)") public Object proceed(ProceedingJoinPoint proceedingJoinPoint, ReadOnlyConnection readOnlyConnection) throws Throwable { diff --git a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java b/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java index 1bb7fd017..7fe7e7a16 100644 --- a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java +++ b/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.auditoria.interceptor; import java.io.Serializable; import java.sql.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.EmptyInterceptor; import org.hibernate.Session; @@ -26,7 +27,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; public class AuditInterceptor extends EmptyInterceptor { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(AuditInterceptor.class); + private static final Logger log = LogManager.getLogger(AuditInterceptor.class); // Considera que o ADM sempre tenha o ID igual a 1 private Integer SISTEMA_ID = 1; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java index afc4115d7..1ce892b27 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AidfHibernateDAO.java @@ -6,7 +6,8 @@ import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SessionFactory; @@ -25,7 +26,7 @@ import com.rjconsultores.ventaboletos.vo.aidf.AidfVo; @Repository("aidfDAO") public class AidfHibernateDAO extends GenericHibernateDAO implements AidfDAO { - private static Logger log = Logger.getLogger(AidfHibernateDAO.class); + private static final Logger log = LogManager.getLogger(AidfHibernateDAO.class); @Autowired public AidfHibernateDAO( diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java index 51c82f9ac..4f9b1d198 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BoletoHibernateDAO.java @@ -8,7 +8,8 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SQLQuery; @@ -35,7 +36,7 @@ import com.rjconsultores.ventaboletos.vo.embarcada.PtoVtaUsuarioUltimaVendaDispo */ @Repository("boletoDAO") public class BoletoHibernateDAO extends GenericHibernateDAO implements BoletoDAO { - private static Logger log = Logger.getLogger(BoletoHibernateDAO.class); + private static final Logger log = LogManager.getLogger(BoletoHibernateDAO.class); @Autowired public BoletoHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { setSessionFactory(factory); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java index 129fc32d1..cf5118cf4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BpeHibernateDAO.java @@ -14,7 +14,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.transform.AliasToBeanResultTransformer; @@ -49,7 +50,7 @@ import br.inf.portalfiscal.bpe.TBPe; @Repository("bpeDAO") public class BpeHibernateDAO extends HibernateDaoSupport implements BpeDAO { - private static Logger log = Logger.getLogger(BpeHibernateDAO.class); + private static final Logger log = LogManager.getLogger(BpeHibernateDAO.class); private static final String DATE_FORMAT_DMY = "dd/MM/yyyy"; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java index e96920d61..d4ff3cd78 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CalcularPeajeHibernateDAO.java @@ -17,7 +17,8 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -62,7 +63,7 @@ public class CalcularPeajeHibernateDAO extends GenericHibernateDAO buscarRutaWithCasetaPeajeFromOrgao(OrgaoConcedente oc) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java index 8b51d0211..a14e975db 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConferenciaComissaoHibernateDAO.java @@ -23,7 +23,8 @@ import java.util.TreeSet; import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.Query; @@ -62,7 +63,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class ConferenciaComissaoHibernateDAO extends GenericHibernateDAO implements ConferenciaComissaoDAO { - private static Logger log = Logger.getLogger(ConferenciaComissaoHibernateDAO.class); + private static final Logger log = LogManager.getLogger(ConferenciaComissaoHibernateDAO.class); @Autowired private ContaCorrenteAgenciaDAO contaCorrenteAgenciaDAO; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java index 11f6990ea..be93056de 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ContaCorrenteAgenciaHibernateDAO.java @@ -4,7 +4,8 @@ import java.math.BigDecimal; import java.util.Calendar; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.SessionFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -23,7 +24,7 @@ import com.rjconsultores.ventaboletos.exception.BusinessException; @Repository("contaCorrenteAgenciaDAO") public class ContaCorrenteAgenciaHibernateDAO extends GenericHibernateDAO implements ContaCorrenteAgenciaDAO { - private static Logger log = Logger.getLogger(ContaCorrenteAgenciaHibernateDAO.class); + private static final Logger log = LogManager.getLogger(ContaCorrenteAgenciaHibernateDAO.class); @Autowired public ContaCorrenteAgenciaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java index 1831d988a..cf69ef26c 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CorridaHibernateDAO.java @@ -13,7 +13,8 @@ import java.util.GregorianCalendar; import java.util.List; import org.apache.commons.lang.math.NumberUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SQLQuery; @@ -67,7 +68,7 @@ public class CorridaHibernateDAO extends GenericHibernateDAO obtenerTramoTarjetaEmitida() { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java index 22de9f537..48df764e0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/EmbarcadaDispOperadorHibernateDAO.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.transform.Transformers; @@ -19,7 +20,7 @@ import com.rjconsultores.ventaboletos.entidad.EmbarcadaDispOperador; @Repository("embarcadaDispOperadorDAO") public class EmbarcadaDispOperadorHibernateDAO extends GenericHibernateDAO implements EmbarcadaDispOperadorDAO { - private static Logger log = Logger.getLogger(EmbarcadaDispOperadorHibernateDAO.class); + private static final Logger log = LogManager.getLogger(EmbarcadaDispOperadorHibernateDAO.class); @Autowired public EmbarcadaDispOperadorHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 86f3b4621..740d60ff9 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -19,7 +19,8 @@ import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.jdbc.Work; @@ -74,7 +75,7 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO private static final String CODIGO_INDICADOR_CONTR_PREVIDENCIARIA = "00000060"; - private static Logger log = Logger.getLogger(FiscalHibernateDAO.class); + private static final Logger log = LogManager.getLogger(FiscalHibernateDAO.class); @Autowired private DataSource dataSource; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java index 30121ad3d..c0122f882 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FormaPagamentoAgenciaDAOImpl.java @@ -10,7 +10,8 @@ import java.sql.ResultSet; import java.util.Date; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Repository; import com.rjconsultores.ventaboletos.dao.FormaPagamentoAgenciaDAO; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.dao.FormaPagamentoAgenciaDAO; @Repository("formaPagamentoAgenciaDAO") public class FormaPagamentoAgenciaDAOImpl implements FormaPagamentoAgenciaDAO { - private static final Logger log = Logger.getLogger(FormaPagamentoAgenciaDAOImpl.class); + private static final Logger log = LogManager.getLogger(FormaPagamentoAgenciaDAOImpl.class); private String getSql(Date dataInicio, Date dataFinal) { StringBuilder where = new StringBuilder(); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java index 35aaed7d1..7cba79217 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GP_PricingDiaHibernateDAO.java @@ -4,7 +4,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SessionFactory; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.entidad.Pricing; public class GP_PricingDiaHibernateDAO extends GenericHibernateDAO implements GP_PricingDiaDAO { - private static Logger log = Logger.getLogger(GP_PricingDiaHibernateDAO.class); + private static final Logger log = LogManager.getLogger(GP_PricingDiaHibernateDAO.class); @Autowired public GP_PricingDiaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java index 9d2fc77fe..262c1f16d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeCategoriaVentaDAOImpl.java @@ -14,7 +14,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Date; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Repository; /** @@ -24,7 +25,7 @@ import org.springframework.stereotype.Repository; @Repository("informeCategoriaVentaDAO") public class InformeCategoriaVentaDAOImpl implements InformeCategoriaVentaDAO { - private static final Logger log = Logger.getLogger(InformeCategoriaVentaDAOImpl.class); + private static final Logger log = LogManager.getLogger(InformeCategoriaVentaDAOImpl.class); private String getSql(PuntoVenta puntoVenta, Ruta ruta, Parada origen, Parada destino, Empresa empresa, Integer numServicio, Date dataInicio, diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java index b6a37a640..767492023 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformePasajeroServicioDAOImpl.java @@ -12,7 +12,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Date; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Repository; /** @@ -22,7 +23,7 @@ import org.springframework.stereotype.Repository; @Repository("informePasajeroServicioDAO") public class InformePasajeroServicioDAOImpl implements InformePasajeroServicioDAO { - private static final Logger log = Logger.getLogger(InformePasajeroServicioDAOImpl.class); + private static final Logger log = LogManager.getLogger(InformePasajeroServicioDAOImpl.class); private String getSql(Empresa empresa, Marca marca, Integer numServicio, Date dataInicio, Date dataFinal) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java index e62e5d167..97a191291 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeServicioDiarioDAOImpl.java @@ -11,7 +11,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Date; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Repository; /** @@ -21,7 +22,7 @@ import org.springframework.stereotype.Repository; @Repository("informeServicioDiarioDAO") public class InformeServicioDiarioDAOImpl implements InformeServicioDiarioDAO { - private static final Logger log = Logger.getLogger(InformeServicioDiarioDAOImpl.class); + private static final Logger log = LogManager.getLogger(InformeServicioDiarioDAOImpl.class); private String getSql(Empresa empresa, Integer numServicio, Date dataInicio, Date dataFinal) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java index 1c87fc79b..7885d6c02 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/InformeVentasPuntoVentaDAOImpl.java @@ -11,7 +11,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Date; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Repository; /** @@ -21,7 +22,7 @@ import org.springframework.stereotype.Repository; @Repository("informeVentasPuntoVentaDAO") public class InformeVentasPuntoVentaDAOImpl implements InformeVentasPuntoVentaDAO { - private static final Logger log = Logger.getLogger(InformeVentasPuntoVentaDAOImpl.class); + private static final Logger log = LogManager.getLogger(InformeVentasPuntoVentaDAOImpl.class); private String getSql(PuntoVenta puntoVenta, Date dataInicio, Date dataFinal) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java index 6adb0eff6..c0160f75d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCCFHibernateDAO.java @@ -10,7 +10,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.jdbc.Work; @@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @Repository("monitoramentoCCFDAO") public class MonitoramentoCCFHibernateDAO extends GenericHibernateDAO implements MonitoramentoCCFDAO { - private static Logger log = Logger.getLogger(MonitoramentoCCFHibernateDAO.class); + private static final Logger log = LogManager.getLogger(MonitoramentoCCFHibernateDAO.class); private Connection con; Boolean jaexiste; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java index 67465cedb..b06d98083 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/MonitoramentoCRZHibernateDAO.java @@ -10,7 +10,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.jdbc.Work; @@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @Repository("monitoramentoCRZDAO") public class MonitoramentoCRZHibernateDAO extends GenericHibernateDAO implements MonitoramentoCRZDAO { - private static Logger log = Logger.getLogger(MonitoramentoCRZHibernateDAO.class); + private static final Logger log = LogManager.getLogger(MonitoramentoCRZHibernateDAO.class); Boolean jaexiste; @Autowired diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java index 0ad9ce91a..c9c75687f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/OperadorEmbarcadaServicoHibernateDAO.java @@ -8,7 +8,8 @@ import java.util.List; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.transform.ResultTransformer; @@ -45,7 +46,7 @@ import com.rjconsultores.ventaboletos.vo.via.ViaVO; @SuppressWarnings({"unchecked", "rawtypes"}) public class OperadorEmbarcadaServicoHibernateDAO extends GenericHibernateDAO implements OperadorEmbarcadaServicoDAO { - private static Logger log = Logger.getLogger(OperadorEmbarcadaServicoHibernateDAO.class); + private static final Logger log = LogManager.getLogger(OperadorEmbarcadaServicoHibernateDAO.class); @Autowired private CategoriaDescuentoDAO categoriaDescuentoDAO; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java index d05e8e5b5..2e41b494a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/PricingDiaHibernateDAO.java @@ -10,7 +10,8 @@ import com.rjconsultores.ventaboletos.entidad.PricingDia; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SessionFactory; @@ -27,7 +28,7 @@ import org.springframework.stereotype.Repository; public class PricingDiaHibernateDAO extends GenericHibernateDAO implements PricingDiaDAO { - private static Logger log = Logger.getLogger(PricingDiaHibernateDAO.class); + private static final Logger log = LogManager.getLogger(PricingDiaHibernateDAO.class); @Autowired public PricingDiaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java index 01d7371d3..90aa1dd18 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ReceitaDespesaHibernateDAO.java @@ -17,7 +17,8 @@ import javax.sql.DataSource; import org.apache.commons.lang.BooleanUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; @@ -30,7 +31,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @Repository("receitaDespesaDAO") public class ReceitaDespesaHibernateDAO implements ReceitaDespesaDAO { - private static Logger log = Logger.getLogger(ReceitaDespesaHibernateDAO.class); + private static final Logger log = LogManager.getLogger(ReceitaDespesaHibernateDAO.class); @Autowired private DataSource dataSourceRead; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java index 8871712b8..b02636c24 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RedondeoCtrlHibernateDAO.java @@ -10,7 +10,8 @@ import com.rjconsultores.ventaboletos.entidad.RedondeoMarca; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SessionFactory; @@ -27,7 +28,7 @@ import org.springframework.stereotype.Repository; public class RedondeoCtrlHibernateDAO extends GenericHibernateDAO implements RedondeoCtrlDAO { - private static Logger log = Logger.getLogger(RedondeoCtrlHibernateDAO.class); + private static final Logger log = LogManager.getLogger(RedondeoCtrlHibernateDAO.class); @Autowired public RedondeoCtrlHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java index b547af06c..0988c0b99 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java @@ -13,7 +13,8 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Query; import org.hibernate.SessionFactory; import org.hibernate.transform.AliasToBeanResultTransformer; @@ -82,7 +83,7 @@ public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO implements TarifaEmbarcadaDAO { - private static Logger log = Logger.getLogger(TarifaEmbarcadaHibernateDAO.class); + private static final Logger log = LogManager.getLogger(TarifaEmbarcadaHibernateDAO.class); @Autowired public TarifaEmbarcadaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java index 3b16a134a..749eeb8b2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TarifaHibernateDAO.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.util.List; import org.apache.commons.lang.Validate; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SQLQuery; @@ -51,7 +52,7 @@ import com.rjconsultores.ventaboletos.vo.comissao.TarifaVO; @Repository("tarifaDAO") public class TarifaHibernateDAO extends GenericHibernateDAO implements TarifaDAO { - private static Logger log = Logger.getLogger(TarifaHibernateDAO.class); + private static final Logger log = LogManager.getLogger(TarifaHibernateDAO.class); @Autowired public TarifaHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java index 22901471f..bc7a3de67 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/TramoServicioHibernateDAO.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SessionFactory; @@ -32,7 +33,7 @@ import com.rjconsultores.ventaboletos.entidad.Via; public class TramoServicioHibernateDAO extends GenericHibernateDAO implements TramoServicioDAO { - private static Logger log = Logger.getLogger(TramoServicioHibernateDAO.class); + private static final Logger log = LogManager.getLogger(TramoServicioHibernateDAO.class); @Autowired public TramoServicioHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java index 2cdb2a0c5..b0f9d655e 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/UsuarioSesionHibernateDAO.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.SessionFactory; @@ -25,7 +26,7 @@ import com.rjconsultores.ventaboletos.entidad.UsuarioSesion; */ @Repository("usuarioSesionDAO") public class UsuarioSesionHibernateDAO extends GenericHibernateDAO implements UsuarioSesionDAO { - private static Logger log = Logger.getLogger(UsuarioSesionHibernateDAO.class); + private static final Logger log = LogManager.getLogger(UsuarioSesionHibernateDAO.class); @Autowired public UsuarioSesionHibernateDAO(@Qualifier("sessionFactory") SessionFactory factory) { diff --git a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java index cf54c5f44..2b80cc5a0 100644 --- a/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java +++ b/src/com/rjconsultores/ventaboletos/dao/sqlbuilder/SQLFactory.java @@ -1,12 +1,13 @@ package com.rjconsultores.ventaboletos.dao.sqlbuilder; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.dao.sqlbuilder.impl.SQLBuilderOracle; import com.rjconsultores.ventaboletos.dao.util.DBUtil; public class SQLFactory { - private static Logger log = Logger.getLogger(SQLFactory.class); + private static final Logger log = LogManager.getLogger(SQLFactory.class); public SQLBuilder getBuilder() { if (DBUtil.getInstance().isOracle()) { diff --git a/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java b/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java index 0f82880e8..724420380 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/AidfGenerator.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.dao.util; import java.io.Serializable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.IdentifierGenerator; @@ -17,7 +18,7 @@ import org.hibernate.id.IdentifierGenerator; */ public class AidfGenerator implements IdentifierGenerator { - private static Logger log = Logger.getLogger(AidfGenerator.class); + private static final Logger log = LogManager.getLogger(AidfGenerator.class); @Override public Serializable generate(SessionImplementor session, Object object) throws HibernateException { diff --git a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java b/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java index ee1700f65..938f0db1a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioGenerator.java @@ -2,13 +2,14 @@ package com.rjconsultores.ventaboletos.dao.util; import java.io.Serializable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.IdentifierGenerator; public class ClaseServicioGenerator implements IdentifierGenerator { - private static Logger log = Logger.getLogger(ClaseServicioGenerator.class); + private static final Logger log = LogManager.getLogger(ClaseServicioGenerator.class); @Override public Serializable generate(SessionImplementor session, Object object) throws HibernateException { diff --git a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java b/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java index ca6111a79..4a341eaec 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/ClaseServicioStore.java @@ -6,12 +6,13 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; public class ClaseServicioStore { - private static Logger log = Logger.getLogger(ClaseServicioStore.class); + private static final Logger log = LogManager.getLogger(ClaseServicioStore.class); private static ClaseServicioStore INSTANCE = new ClaseServicioStore(); protected int qtdMaxima = 99; diff --git a/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java b/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java index 9b5fc3c3a..db13f5f43 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/DBUtil.java @@ -4,13 +4,14 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.SessionFactory; import org.springframework.core.io.ClassPathResource; public class DBUtil { - private static Logger log = Logger.getLogger(DBUtil.class); + private static final Logger log = LogManager.getLogger(DBUtil.class); private static DBUtil INSTANCE; private static Properties p; private SessionFactory sessionFactory; diff --git a/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java b/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java index 197a486b2..4c5d017c4 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/FormaPagoGenerator.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.dao.util; import java.io.Serializable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.IdentifierGenerator; @@ -14,7 +15,7 @@ import org.hibernate.id.IdentifierGenerator; */ public class FormaPagoGenerator implements IdentifierGenerator { - private static Logger log = Logger.getLogger(FormaPagoGenerator.class); + private static final Logger log = LogManager.getLogger(FormaPagoGenerator.class); @Override public Short generate(SessionImplementor session, Object object) throws HibernateException { diff --git a/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java b/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java index 77f517b7d..671ed5e6f 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/IdAidfStore.java @@ -7,7 +7,8 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; /** * Classe que trata a geração do ID da tabela Aidf. @@ -20,7 +21,7 @@ import org.hibernate.HibernateException; */ public class IdAidfStore { - private static Logger log = Logger.getLogger(IdAidfStore.class); + private static final Logger log = LogManager.getLogger(IdAidfStore.class); private static final String LIMITE_ID_AIDF = "LIMITE_ID_AIDF"; diff --git a/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java b/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java index e45294648..8c10daf0b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/IdFormaPagoStore.java @@ -7,7 +7,8 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; /** @@ -17,7 +18,7 @@ import org.hibernate.HibernateException; */ public class IdFormaPagoStore { - private static Logger log = Logger.getLogger(IdFormaPagoStore.class); + private static final Logger log = LogManager.getLogger(IdFormaPagoStore.class); private static final String LIMITE_ID_FORMA_PAGTO = "LIMITE_ID_FORMA_PAGTO"; diff --git a/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java b/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java index a48799652..4a2790da3 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/IdTipoParadaStore.java @@ -7,7 +7,8 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; /** @@ -17,7 +18,7 @@ import org.hibernate.HibernateException; */ public class IdTipoParadaStore { - private static Logger log = Logger.getLogger(IdTipoParadaStore.class); + private static final Logger log = LogManager.getLogger(IdTipoParadaStore.class); private static final String LIMITE_ID_TIPO_PARADA = "LIMITE_ID_TIPO_PARADA"; diff --git a/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java b/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java index 8e177f6d8..efd42284b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java +++ b/src/com/rjconsultores/ventaboletos/dao/util/TipoParadaGenerator.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.dao.util; import java.io.Serializable; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.id.IdentifierGenerator; @@ -14,7 +15,7 @@ import org.hibernate.id.IdentifierGenerator; */ public class TipoParadaGenerator implements IdentifierGenerator { - private static Logger log = Logger.getLogger(TipoParadaGenerator.class); + private static final Logger log = LogManager.getLogger(TipoParadaGenerator.class); @Override public Short generate(SessionImplementor session, Object object) throws HibernateException { diff --git a/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java b/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java index 19edc76cd..6ec982fd4 100644 --- a/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java +++ b/src/com/rjconsultores/ventaboletos/rest/ContingenciaClienteRest.java @@ -12,7 +12,8 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.zkoss.zkplus.spring.SpringUtil; @@ -34,7 +35,7 @@ public class ContingenciaClienteRest { private static final String PATH_CONSULTA_STATUS = "/BPeRS/rest/adm/contingencia/tipoEmissaoEmpresa"; private static final String PATH_DEFINIR_STATUS = "/BPeRS/rest/adm/contingencia/definirTipoEmissaoEmpresa"; - private static Logger log = Logger.getLogger(ContingenciaClienteRest.class); + private static final Logger log = LogManager.getLogger(ContingenciaClienteRest.class); private static ContingenciaClienteRest instance; diff --git a/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java b/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java index b30ef6f5b..89f2860b5 100644 --- a/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java +++ b/src/com/rjconsultores/ventaboletos/rest/IntegracaoSapRest.java @@ -10,7 +10,8 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONObject; import com.rjconsultores.ventaboletos.enums.TipoEnvioRest; @@ -18,7 +19,7 @@ import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; public class IntegracaoSapRest { - private static Logger log = Logger.getLogger(IntegracaoSapRest.class); + private static final Logger log = LogManager.getLogger(IntegracaoSapRest.class); private static IntegracaoSapRest instance; diff --git a/src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java b/src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java index 1e84ee13b..05ce47e96 100644 --- a/src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java +++ b/src/com/rjconsultores/ventaboletos/rest/MercadoPagoService.java @@ -6,7 +6,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.WordUtils; import org.apache.http.HttpStatus; import org.apache.http.entity.ContentType; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.google.gson.Gson; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.vo.mercadopago.StoreVO.Location; public class MercadoPagoService { - private static Logger log = Logger.getLogger(MercadoPagoService.class); + private static final Logger log = LogManager.getLogger(MercadoPagoService.class); private static MercadoPagoService instance; diff --git a/src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java b/src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java index f18f7bbcd..feaa29505 100644 --- a/src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java +++ b/src/com/rjconsultores/ventaboletos/rest/generic/GenericRest.java @@ -18,14 +18,15 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.util.EntityUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.google.gson.Gson; import com.rjconsultores.ventaboletos.enums.TipoEnvioRest; public class GenericRest { - private static Logger log = Logger.getLogger(GenericRest.class); + private static final Logger log = LogManager.getLogger(GenericRest.class); private static GenericRest instance; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java index cf0891165..1a0a067a9 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/BpeServiceImpl.java @@ -11,7 +11,8 @@ import java.util.Map; import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.stereotype.Service; @@ -30,7 +31,7 @@ import com.rjconsultores.ventaboletos.vo.bpe.BPeVO; @Service("bpeService") public class BpeServiceImpl implements BpeService { - private static Logger log = Logger.getLogger(BpeServiceImpl.class); + private static final Logger log = LogManager.getLogger(BpeServiceImpl.class); @Autowired private BpeDAO bpeDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CiudadServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CiudadServiceImpl.java index 44fd7d0a8..8be65435d 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CiudadServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CiudadServiceImpl.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +28,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @Service("ciudadService") public class CiudadServiceImpl implements CiudadService { - private static Logger log = Logger.getLogger(CiudadServiceImpl.class); + private static final Logger log = LogManager.getLogger(CiudadServiceImpl.class); @Autowired private CiudadDAO ciudadDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java index f2a8b94c5..0a8464405 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CoeficienteTarifaServiceImpl.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,7 +29,7 @@ public class CoeficienteTarifaServiceImpl implements CoeficienteTarifaService { private OrgaoTramoDAO orgaoTramoDAO; @Autowired private LogAuditoriaService logAuditoriaService; - private static Logger log = Logger.getLogger(OrgaoConcedenteServiceImpl.class); + private static final Logger log = LogManager.getLogger(OrgaoConcedenteServiceImpl.class); public List obtenerTodos() { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java index b4254f219..7d38038ce 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ConexionRutaLocalidadeRemovidaServiceImpl.java @@ -4,7 +4,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java index 27a9f42c9..ab4d980dc 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ConferenciaComissaoServiceImpl.java @@ -13,7 +13,8 @@ import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -62,7 +63,7 @@ public class ConferenciaComissaoServiceImpl implements ConferenciaComissaoServic private static final String SMTP_PORT = "SMTP_PORT"; private static final String SMTP_PASS = "SMTP_PASS"; - private static Logger log = Logger.getLogger(ConferenciaComissaoService.class); + private static final Logger log = LogManager.getLogger(ConferenciaComissaoService.class); @Autowired private ConferenciaComissaoDAO conferenciaComissaoDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java index 0773e6977..d38f31c65 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ContingenciaServiceImpl.java @@ -10,7 +10,8 @@ import javax.mail.SendFailedException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,7 +44,7 @@ public class ContingenciaServiceImpl implements ContingenciaService { private static final String EMAIL_SUPORTE_SCO_RJCONSULTORES = "EMAIL_SUPORTE_RJCONSULTORES"; - private static Logger log = Logger.getLogger(ContingenciaServiceImpl.class); + private static final Logger log = LogManager.getLogger(ContingenciaServiceImpl.class); @Autowired private LogHistoricoContingenciaDAO histContingenciaDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java index bc1292b3b..380b52493 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CorridaServiceImpl.java @@ -17,7 +17,8 @@ import javax.persistence.Transient; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -95,7 +96,7 @@ import com.rjconsultores.ventaboletos.utilerias.UtiliteriasFiscal; @Service("corridaService") public class CorridaServiceImpl implements CorridaService { - private static Logger log = Logger.getLogger(CorridaServiceImpl.class); + private static final Logger log = LogManager.getLogger(CorridaServiceImpl.class); private static int CANT_MAX_CORRIDA_GERA_MANUAL = 40; private static SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); // Tipo de venda Reserva diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java index df0e2ebfc..8063801f8 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CotacaoServiceImpl.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -17,7 +18,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @Service("cotacaoService") public class CotacaoServiceImpl implements CotacaoService { - private static Logger log = Logger.getLogger(CotacaoServiceImpl.class); + private static final Logger log = LogManager.getLogger(CotacaoServiceImpl.class); @Autowired private CotacaoDAO cotacaoDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java index d7b730274..0c88bd4d7 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/CtrlFechamentoCaixaServiceImpl.java @@ -4,7 +4,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,7 +19,7 @@ import com.rjconsultores.ventaboletos.utilerias.DateUtil; @Service("ctrlFechamentoCaixaService") public class CtrlFechamentoCaixaServiceImpl implements CtrlFechamentoCaixaService { - private static Logger log = Logger.getLogger(CtrlFechamentoCaixaServiceImpl.class); + private static final Logger log = LogManager.getLogger(CtrlFechamentoCaixaServiceImpl.class); @Autowired CtrlFechamentoCaixaDAO ctrlFechamentoCaixaDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java index 352ed5e62..e83d19eeb 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/EmpresaServiceImpl.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -50,7 +51,7 @@ public class EmpresaServiceImpl implements EmpresaService { private EsquemaCorridaDAO esquemaCorridaDAO; @Autowired private LogAuditoriaService logAuditoriaService; - private static Logger log = Logger.getLogger(EmpresaServiceImpl.class); + private static final Logger log = LogManager.getLogger(EmpresaServiceImpl.class); public List obtenerTodos() { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java index 271339cc7..fb991ad45 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/EsquemaCorridaServiceImpl.java @@ -9,7 +9,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,7 +45,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @Service("esquemaCorridaService") public class EsquemaCorridaServiceImpl implements EsquemaCorridaService { - private static Logger log = Logger.getLogger(EsquemaCorridaServiceImpl.class); + private static final Logger log = LogManager.getLogger(EsquemaCorridaServiceImpl.class); @Autowired private EsquemaCorridaDAO esquemaCorridaDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java index 99e340731..df1d36fbc 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/FechamentoParamptovtaServiceImpl.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,7 +23,7 @@ public class FechamentoParamptovtaServiceImpl implements FechamentoParamptovtaSe private FechamentoParamptovtaDAO fechamentoParamptovtaDAO; @Autowired private LogAuditoriaService logAuditoriaService; - private static Logger log = Logger.getLogger(FechamentoParamptovtaServiceImpl.class); + private static final Logger log = LogManager.getLogger(FechamentoParamptovtaServiceImpl.class); @Override diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java index e9620ecd2..e7234c635 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/FiscalServiceImpl.java @@ -19,7 +19,8 @@ import java.util.concurrent.TimeUnit; import javax.sql.DataSource; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -68,7 +69,7 @@ import com.rjconsultores.ventaboletos.vo.impressaofiscal.LeitorNaoFiscalVO; @Service("fiscalService") public class FiscalServiceImpl implements FiscalService { - private static Logger log = Logger.getLogger(FiscalServiceImpl.class); + private static final Logger log = LogManager.getLogger(FiscalServiceImpl.class); public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; public static final BigDecimal CEM = BigDecimal.valueOf(100); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java index 18d902bf8..9091da839 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/FormaPagamentoAgenciaServiceImpl.java @@ -15,7 +15,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.zkoss.util.media.AMedia; @@ -40,7 +41,7 @@ public class FormaPagamentoAgenciaServiceImpl implements FormaPagamentoAgenciaSe private FormaPagamentoAgenciaDAO financeiroDAO; @Autowired private DataSource dataSource; - private static final Logger log = Logger.getLogger(FormaPagamentoAgenciaServiceImpl.class); + private static final Logger log = LogManager.getLogger(FormaPagamentoAgenciaServiceImpl.class); public AMedia gerarInforme(InputStream informe, Map parameters) throws BusinessException { Connection conn = null; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java index 3f8b0870f..7bd97a0e6 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/GP_PricingHistoricoServiceImpl.java @@ -6,7 +6,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -24,7 +25,7 @@ public class GP_PricingHistoricoServiceImpl implements GP_PricingHistoricoServic @Autowired private GP_PricingHistoricoDAO pricingHistoricoDAO; - private static Logger log = Logger.getLogger(GP_PricingHistoricoServiceImpl.class); + private static final Logger log = LogManager.getLogger(GP_PricingHistoricoServiceImpl.class); @Override @Transactional diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java index cf86ce878..d8ea55654 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesServiceImpl.java @@ -13,7 +13,8 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -54,7 +55,7 @@ public class ImportacaoClientesServiceImpl implements ImportacaoClientesService @Autowired private ClienteService clienteService; - private static Logger log = Logger.getLogger(ImportacaoClientesServiceImpl.class); + private static final Logger log = LogManager.getLogger(ImportacaoClientesServiceImpl.class); @Override public String[] lerArquivo(Reader reader, List empresas) { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java index 212fd1f1f..ef8b67b56 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoClientesSrvpServiceImpl.java @@ -13,7 +13,8 @@ import java.util.Iterator; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -49,7 +50,7 @@ public class ImportacaoClientesSrvpServiceImpl implements ImportacaoClientesSrvp TipoIdentificacionService tipoIdentificacionService; @Autowired private ClienteService clienteService; - private static Logger log = Logger.getLogger(ImportacaoClientesSrvpServiceImpl.class); + private static final Logger log = LogManager.getLogger(ImportacaoClientesSrvpServiceImpl.class); @Override public String[] lerArquivo(Reader reader, List empresas) { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java index 6a63383da..18a888a3a 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/ImportacaoRetornoBancarioServiceImpl.java @@ -7,7 +7,8 @@ import java.io.InputStreamReader; import java.math.BigDecimal; import java.sql.SQLException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -31,7 +32,7 @@ public class ImportacaoRetornoBancarioServiceImpl implements ImportacaoRetornoBa @Autowired private RemessaCNABBancosDAO remessaCNABBancosDAO; - private static Logger log = Logger.getLogger(ImportacaoRetornoBancarioServiceImpl.class); + private static final Logger log = LogManager.getLogger(ImportacaoRetornoBancarioServiceImpl.class); @Override public String lerArquivo(ByteArrayInputStream bais, Empresa empresa){ diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java index 8348725d2..e9a44ec69 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/InformeCategoriaVentaServiceImpl.java @@ -15,7 +15,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.zkoss.util.media.AMedia; @@ -41,7 +42,7 @@ public class InformeCategoriaVentaServiceImpl implements InformeCategoriaVentaSe private InformeCategoriaVentaDAO informeCategoriaVentaDAO; @Autowired private DataSource dataSource; - private static final Logger log = Logger.getLogger(InformeCategoriaVentaServiceImpl.class); + private static final Logger log = LogManager.getLogger(InformeCategoriaVentaServiceImpl.class); public AMedia gerarInforme(InputStream informe, Map parameters) throws BusinessException{ Connection conn = null; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java index c0139a8e4..68e6ea54c 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/InformePasajeroServicioServiceImpl.java @@ -15,7 +15,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.zkoss.util.media.AMedia; @@ -41,7 +42,7 @@ public class InformePasajeroServicioServiceImpl implements InformePasajeroServic private InformePasajeroServicioDAO informePasajeroServicioDAO; @Autowired private DataSource dataSource; - private static final Logger log = Logger.getLogger(InformePasajeroServicioServiceImpl.class); + private static final Logger log = LogManager.getLogger(InformePasajeroServicioServiceImpl.class); public AMedia gerarInforme(InputStream informe, Map parameters) throws BusinessException { Connection conn = null; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java index 7f5be17b5..0afba2743 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/InformeServicioDiarioServiceImpl.java @@ -20,7 +20,8 @@ import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRResultSetDataSource; import net.sf.jasperreports.engine.JasperRunManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.zkoss.util.media.AMedia; @@ -41,7 +42,7 @@ public class InformeServicioDiarioServiceImpl implements InformeServicioDiarioSe private InformeServicioDiarioDAO informeServicioDiarioDAO; @Autowired private DataSource dataSource; - private static final Logger log = Logger.getLogger(InformeServicioDiarioServiceImpl.class); + private static final Logger log = LogManager.getLogger(InformeServicioDiarioServiceImpl.class); public AMedia gerarInforme(InputStream informe, Map parameters) throws BusinessException { AMedia amedia = null; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java index ef77be93d..4ad438e24 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/InformeVentasPuntoVentaServiceImpl.java @@ -20,7 +20,8 @@ import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRResultSetDataSource; import net.sf.jasperreports.engine.JasperRunManager; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.zkoss.util.media.AMedia; @@ -40,7 +41,7 @@ public class InformeVentasPuntoVentaServiceImpl implements InformeVentasPuntoVen private InformeVentasPuntoVentaDAO informeVentasPuntoVentaDAO; @Autowired private DataSource dataSource; - private static final Logger log = Logger.getLogger(InformeVentasPuntoVentaServiceImpl.class); + private static final Logger log = LogManager.getLogger(InformeVentasPuntoVentaServiceImpl.class); public AMedia gerarInforme(InputStream informe, Map parameters) throws BusinessException { Connection conn = null; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java index a68ebe0a8..4035a9c02 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/IntegracaoServiceImpl.java @@ -9,7 +9,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,7 +24,7 @@ import com.rjconsultores.ventaboletos.vo.exportacao.QdmpDerLinhaVo; @Service("integracaoService") public class IntegracaoServiceImpl implements IntegracaoService { - private static Logger log = Logger.getLogger(IntegracaoServiceImpl.class); + private static final Logger log = LogManager.getLogger(IntegracaoServiceImpl.class); public static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; public static final String QUEBRA_LINHA = "\r\n"; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java index 204a984a5..8bbb5e3f1 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/LogAuditoriaServiceImpl.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,7 +22,7 @@ import br.com.rjconsultores.auditador.model.AuditadorObjects; @Service("LogAuditoriaService") public class LogAuditoriaServiceImpl implements LogAuditoriaService { - private static Logger log = Logger.getLogger(LogAuditoriaServiceImpl.class); + private static final Logger log = LogManager.getLogger(LogAuditoriaServiceImpl.class); @Autowired private LogAuditoriaDAO logAuditoriaDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java index f1ef7ed7c..639bda102 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/MonedaServiceImpl.java @@ -15,7 +15,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional; @Service("monedaService") public class MonedaServiceImpl implements MonedaService { - private static Logger log = Logger.getLogger(MonedaServiceImpl.class); + private static final Logger log = LogManager.getLogger(MonedaServiceImpl.class); @Autowired private MonedaDAO monedaDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java index 22e870f5f..7862f5f04 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java @@ -10,7 +10,8 @@ import java.util.Map.Entry; import javax.sql.DataSource; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @Service("monitoramentoCCFService") public class MonitoramentoCCFServiceImpl implements MonitoramentoCCFService{ - private static Logger log = Logger.getLogger(MonitoramentoCCFServiceImpl.class); + private static final Logger log = LogManager.getLogger(MonitoramentoCCFServiceImpl.class); @Autowired private MonitoramentoCCFDAO monitoramentoCCFDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java index 40a3554e1..7d08c4964 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java @@ -4,7 +4,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,7 +17,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @Service("monitoramentoCRZService") public class MonitoramentoCRZServiceImpl implements MonitoramentoCRZService{ - private static Logger log = Logger.getLogger(MonitoramentoCRZServiceImpl.class); + private static final Logger log = LogManager.getLogger(MonitoramentoCRZServiceImpl.class); @Autowired private MonitoramentoCRZDAO monitoramentoCRZDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java index b41760afd..35ca0395e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/OrgaoConcedenteServiceImpl.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,7 +22,7 @@ public class OrgaoConcedenteServiceImpl implements OrgaoConcedenteService { private OrgaoConcedenteDAO orgaoConcedenteDAO; @Autowired private LogAuditoriaService logAuditoriaService; - private static Logger log = Logger.getLogger(OrgaoConcedenteServiceImpl.class); + private static final Logger log = LogManager.getLogger(OrgaoConcedenteServiceImpl.class); public List obtenerTodos() { return orgaoConcedenteDAO.obtenerTodos(); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java index 2b43f14e7..32daeb3c0 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/PricingServiceImpl.java @@ -10,7 +10,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -46,7 +47,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @Service("pricingService") public class PricingServiceImpl implements PricingService { - private static Logger log = Logger.getLogger(PricingServiceImpl.class); + private static final Logger log = LogManager.getLogger(PricingServiceImpl.class); @Autowired private PricingDAO pricingDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java index dcec2d8f9..341bbedce 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/RutaCombinacionServiceImpl.java @@ -31,7 +31,8 @@ import java.util.Calendar; import java.util.List; import java.util.Set; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.hssf.usermodel.HSSFRow; @@ -51,7 +52,7 @@ public class RutaCombinacionServiceImpl implements RutaCombinacionService { @Autowired private RutaCombinacionDAO rutaCombinacionDAO; - private static Logger log = Logger.getLogger(RutaCombinacionServiceImpl.class); + private static final Logger log = LogManager.getLogger(RutaCombinacionServiceImpl.class); private int NUM_LINHA_INICIO = 8; public List obtenerTodos() { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java index 08d27dfdd..4fc8cf097 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/RutaServiceImpl.java @@ -10,7 +10,8 @@ import java.util.Date; import java.util.HashMap; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -66,7 +67,7 @@ public class RutaServiceImpl implements RutaService { @Autowired private TramoRutaService tramoRutaService; - private static Logger log = Logger.getLogger(RutaServiceImpl.class); + private static final Logger log = LogManager.getLogger(RutaServiceImpl.class); public List obtenerTodos() { return rutaDAO.obtenerTodos(); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java index 573b3c42a..6f8ee4837 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/SapServiceImpl.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.service.impl; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -27,7 +28,7 @@ public class SapServiceImpl implements SapService{ private static final String INTEGRACAO_SAP_URL = "INTEGRACAO_SAP_URL"; private static final String INTEGRACAO_SAP_CREDENCIAL = "INTEGRACAO_SAP_CREDENCIAL"; - private static Logger log = Logger.getLogger(SapServiceImpl.class); + private static final Logger log = LogManager.getLogger(SapServiceImpl.class); @Autowired private SapDAO sapDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java index 4f302d7a2..b22765e5e 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/TarifaEmbarcadaServiceImpl.java @@ -8,7 +8,8 @@ import java.math.RoundingMode; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,7 +37,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @Service("tarifaEmbarcadaService") public class TarifaEmbarcadaServiceImpl implements TarifaEmbarcadaService { - private static Logger log = Logger.getLogger(TarifaEmbarcadaService.class); + private static final Logger log = LogManager.getLogger(TarifaEmbarcadaService.class); @Autowired private TarifaEmbarcadaDAO tarifaEmbarcadaDAO; diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java index ead18b388..f03a9b890 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/TarifaServiceImpl.java @@ -10,7 +10,8 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -66,7 +67,7 @@ public class TarifaServiceImpl implements TarifaService { @Autowired private LogAuditoriaService logAuditoriaService; - private static Logger log = Logger.getLogger(TarifaServiceImpl.class); + private static final Logger log = LogManager.getLogger(TarifaServiceImpl.class); public List obtenerTodos() { return tarifaDAO.obtenerTodos(); diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java index 57d762e10..1fe66b420 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/TarjetaViajeServiceImpl.java @@ -6,7 +6,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,7 +38,7 @@ public class TarjetaViajeServiceImpl implements TarjetaViajeService { private RhPagoConductorService rhPagoConductorService; @Autowired private RutaService rutaService; - private static Logger log = Logger.getLogger(TarjetaViajeServiceImpl.class); + private static final Logger log = LogManager.getLogger(TarjetaViajeServiceImpl.class); @Override public List obtenerTodos() { diff --git a/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java index b6790cf00..40f6e60a2 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/TramoRutaServiceImpl.java @@ -8,7 +8,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -50,7 +51,7 @@ import com.rjconsultores.ventaboletos.vo.esquemaoperacional.SecuenciaRutaTramoVO @Service("tramoRutaService") public class TramoRutaServiceImpl implements TramoRutaService { - private static Logger log = Logger.getLogger(TramoRutaServiceImpl.class); + private static final Logger log = LogManager.getLogger(TramoRutaServiceImpl.class); @Autowired private RutaCombinacionService rutaCombinacionService; @Autowired diff --git a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java b/src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java index a89ece884..1a380e744 100644 --- a/src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java +++ b/src/com/rjconsultores/ventaboletos/service/impl/UsuarioServiceImpl.java @@ -8,7 +8,8 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataAccessException; import org.springframework.security.authentication.CredentialsExpiredException; @@ -48,7 +49,7 @@ public class UsuarioServiceImpl implements UsuarioService, UserDetailsService { private UsuarioPerfilDAO usuarioPerfilDAO; @Autowired private LogAuditoriaService logAuditoriaService; - private static Logger log = Logger.getLogger(UsuarioServiceImpl.class); + private static final Logger log = LogManager.getLogger(UsuarioServiceImpl.class); public List buscarPeloNome(String nome) { diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java index b05f6049d..394786b9c 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java @@ -12,7 +12,8 @@ import java.util.Properties; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.core.io.ClassPathResource; @@ -32,7 +33,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; */ public class ApplicationProperties { - private static Logger log = Logger.getLogger(ApplicationProperties.class); + private static final Logger log = LogManager.getLogger(ApplicationProperties.class); private static ApplicationProperties INSTANCE; private static Properties p; private static final String PATH_IMAGENES = "/com/rjconsultores/ventaboletos/web/cliente/imagenes/"; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java b/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java index 20b0a8bce..1bb641782 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/PricingConverterVOToEntidad.java @@ -6,7 +6,8 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; @@ -39,7 +40,7 @@ import com.rjconsultores.ventaboletos.vo.pricing.PricingVigencia; public class PricingConverterVOToEntidad { - private static Logger log = Logger.getLogger(PricingConverterVOToEntidad.class); + private static final Logger log = LogManager.getLogger(PricingConverterVOToEntidad.class); private static PricingConverterVOToEntidad INSTANCE; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java b/src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java index bd10bd4ea..41da47101 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/UsuarioLogado.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.utilerias; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.context.ApplicationContext; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; @@ -25,7 +26,7 @@ import com.rjconsultores.ventaboletos.entidad.UsuarioPerfil; */ public class UsuarioLogado { - private static Logger log = Logger.getLogger(UsuarioLogado.class); + private static final Logger log = LogManager.getLogger(UsuarioLogado.class); public static Usuario getUsuarioLogado() { Usuario usuario = null; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java index e51aa5016..77c1d9222 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECF.java @@ -13,7 +13,8 @@ import java.util.HashMap; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -27,7 +28,7 @@ import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; public class ArchivoIntegracionECF { - private static Logger log = Logger.getLogger(ArchivoIntegracionECF.class); + private static final Logger log = LogManager.getLogger(ArchivoIntegracionECF.class); public File importacionFiscalECFGenerico(Date inicio, Date fim, Empresa empresa, boolean isNormal, boolean isCancelados, boolean isPendencias, List list) { diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java index 56ea04a6c..c5af56d4f 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionECFManual.java @@ -11,7 +11,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -23,7 +24,7 @@ import com.rjconsultores.ventaboletos.vo.impressaofiscal.SubItens; public class ArchivoIntegracionECFManual { - private static Logger log = Logger.getLogger(ArchivoIntegracionECFManual.class); + private static final Logger log = LogManager.getLogger(ArchivoIntegracionECFManual.class); public File importacionFiscalECFManual(Date inicio, Date fim, Empresa empresa, List listManual) { diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java index d3857a4f6..cf6161899 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionNaoFiscal.java @@ -7,7 +7,8 @@ import java.io.PrintWriter; import java.util.Calendar; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.exception.BusinessException; @@ -19,7 +20,7 @@ import com.rjconsultores.ventaboletos.vo.impressaofiscal.ImportacionNaoFiscalVO; public class ArchivoIntegracionNaoFiscal { - private static Logger log = Logger.getLogger(ArchivoIntegracionNaoFiscal.class); + private static final Logger log = LogManager.getLogger(ArchivoIntegracionNaoFiscal.class); private String cnpjFilial; private Integer sequencial = 0; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java index aeb458f70..14f98ee3b 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/archivointegracion/ArchivoIntegracionReducaoZ.java @@ -11,7 +11,8 @@ import java.util.Calendar; import java.util.Date; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -23,7 +24,7 @@ import com.rjconsultores.ventaboletos.vo.impressaofiscal.SituacaoTributaria; public class ArchivoIntegracionReducaoZ { - private static Logger log = Logger.getLogger(ArchivoIntegracionReducaoZ.class); + private static final Logger log = LogManager.getLogger(ArchivoIntegracionReducaoZ.class); public File importacionReducaoZ(Date inicio, Date fim, Empresa empresa, boolean isPendencias, List listReducao) { diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java index 90a3487ee..1ecad6ce0 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/ExportacaoBpe.java @@ -5,7 +5,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Service; import com.rjconsultores.ventaboletos.entidad.Constante; @@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Service("exportacaoBpe") public class ExportacaoBpe { - private static Logger log = Logger.getLogger(ExportacaoBpe.class); + private static final Logger log = LogManager.getLogger(ExportacaoBpe.class); private static String VAZIO = ""; private static String SEPARADOR = "|"; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java index 6284aa732..554806854 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/exportacao/bpe/xml/BPeUtil.java @@ -17,7 +17,8 @@ import javax.xml.bind.Unmarshaller; import javax.xml.transform.stream.StreamSource; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.utilerias.DateUtil; @@ -28,7 +29,7 @@ import br.inf.portalfiscal.bpe.TBPe; public class BPeUtil { - private static Logger log = Logger.getLogger(ExportacaoBPEVo.class); + private static final Logger log = LogManager.getLogger(ExportacaoBPEVo.class); public static TBPe convertXmlToBpe(String xml) { TBPe objeto = null; diff --git a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java b/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java index 009119aa5..1cdc0162c 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/exportacaofiscal/ExportacaoFiscal.java @@ -14,7 +14,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Service; import com.rjconsultores.ventaboletos.constantes.Constantes; @@ -33,7 +34,7 @@ import com.rjconsultores.ventaboletos.utilerias.exportacaofiscal.vo.ExportacaoRM @Service("exportacaoFiscal") public class ExportacaoFiscal { - private static Logger log = Logger.getLogger(ExportacaoFiscal.class); + private static final Logger log = LogManager.getLogger(ExportacaoFiscal.class); private static String VAZIO = ""; private static String SEPARADOR = "|";