diff --git a/pom.xml b/pom.xml index 92c9778b9..3804fd69f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.32.3 + 1.33.0 war - 1.23.2 - 1.19.1 + 1.24.0 + 1.20.0 UTF-8 UTF-8 @@ -95,7 +95,7 @@ br.com.rjconsultores WSAG - 1.0.0 + 1.0.2 br.com.rjconsultores @@ -270,6 +270,12 @@ net.sourceforge.jexcelapi jxl 2.6.12 + + + log4j + log4j + + @@ -277,7 +283,33 @@ colorbox 1.0.0 - + + 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/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java b/src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java index 86342b958..3bb1246ba 100644 --- a/src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java +++ b/src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java @@ -13,7 +13,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 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.ConstantesFuncionSistema; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; @WebFilter(filterName = "authenticationPricingRS", urlPatterns = "/rest/pricing/*") public class AuthenticationPricingRS implements Filter { - private static Logger log = Logger.getLogger(AuthenticationPricingRS.class); + private static Logger log = LogManager.getLogger(AuthenticationPricingRS.class); @Override public void init(FilterConfig filterConfig) throws ServletException { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java index f1f051790..0def8fd93 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java @@ -5,7 +5,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -14,7 +15,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class ReciboEntregaMovimentacao extends Relatorio { - private static Logger log = Logger.getLogger(ReciboEntregaMovimentacao.class); + private static Logger log = LogManager.getLogger(ReciboEntregaMovimentacao.class); List listdata = null; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java index c26308ec5..a74da7e40 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java @@ -11,7 +11,8 @@ import java.util.List; import java.util.Map; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoAntigoBean; @@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public abstract class RelatorioAgenciaFechamento extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioAgenciaFechamento.class); + private static Logger log = LogManager.getLogger(RelatorioAgenciaFechamento.class); protected List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java index 7848f906f..67f6b70d8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java @@ -9,7 +9,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; @@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioAnaliticoFinanceiro extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioAnaliticoFinanceiro.class); + private static Logger log = LogManager.getLogger(RelatorioAnaliticoFinanceiro.class); List listdata = null; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java index 8f637f86d..3d503db3d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java @@ -8,7 +8,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; @@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioAnaliticoVoucher extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioAnaliticoVoucher.class); + private static Logger log = LogManager.getLogger(RelatorioAnaliticoVoucher.class); List listdata = null; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java index 45fb4f2b2..b0589c488 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java @@ -8,7 +8,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; @@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioAnaliticoVoucherCancelados extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioAnaliticoVoucherCancelados.class); + private static Logger log = LogManager.getLogger(RelatorioAnaliticoVoucherCancelados.class); List listdata = null; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java index 944541c0e..7b37bc9e3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java @@ -11,7 +11,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioAproveitamentoFinanceiro extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioAproveitamentoFinanceiro.class); + private static Logger log = LogManager.getLogger(RelatorioAproveitamentoFinanceiro.class); public RelatorioAproveitamentoFinanceiro(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java index 2cc17c3c3..ab13260ca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java @@ -16,7 +16,8 @@ import java.util.Map.Entry; import java.util.Set; import java.util.TreeSet; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -28,7 +29,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioAproveitamentoFinanceiroTrecho extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioAproveitamentoFinanceiroTrecho.class); + private static Logger log = LogManager.getLogger(RelatorioAproveitamentoFinanceiroTrecho.class); public RelatorioAproveitamentoFinanceiroTrecho(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java index 3222c5aeb..f0b6846ec 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioBoletos extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioBoletos.class); + private static Logger log = LogManager.getLogger(RelatorioBoletos.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java index 4bd00b055..02133907b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -20,7 +21,7 @@ public class RelatorioCaixaOrgaoConcedente extends Relatorio { private static final int TODOS = -1; private List lsDadosRelatorio; - private static Logger log = Logger.getLogger(RelatorioCaixaOrgaoConcedente.class); + private static Logger log = LogManager.getLogger(RelatorioCaixaOrgaoConcedente.class); public RelatorioCaixaOrgaoConcedente(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java index 14726eca8..e4ee74a66 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java @@ -18,7 +18,8 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.negocio.CalculoImposto; @@ -36,7 +37,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioComissaoSintetico extends Relatorio { -private Logger log; +private static final Logger log = LogManager.getLogger(RelatorioComissaoSintetico.class);; private List lsDadosRelatorio; private LinkedHashMap> mapCacheConfigComissao; private Set pontoVendaConfiguracao; @@ -45,7 +46,7 @@ private Set pontoVendaConfiguracao; public RelatorioComissaoSintetico(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); - log = Logger.getLogger(RelatorioComissaoSintetico.class); + CalculoImposto.limpaCache(); this.mapCacheConfigComissao = new LinkedHashMap>(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index b6dbe3065..172543cb5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -8,7 +8,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioDepositos extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioDepositos.class); + private static Logger log = LogManager.getLogger(RelatorioDepositos.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java index 3425a4df6..5a6b71788 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java @@ -12,7 +12,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; @@ -28,7 +29,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; */ public class RelatorioDepositosDetalhado extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioDepositosDetalhado.class); + private static Logger log = LogManager.getLogger(RelatorioDepositosDetalhado.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java index 563df8c58..d890d1bbf 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java @@ -11,7 +11,8 @@ import java.util.Iterator; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioDepositosNovo extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioDepositosNovo.class); + private static Logger log = LogManager.getLogger(RelatorioDepositosNovo.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 073afb766..6007ec067 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -10,7 +10,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 com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; @@ -29,7 +30,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioDevolucaoBilhetes extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetes.class); + private static Logger log = LogManager.getLogger(RelatorioDevolucaoBilhetes.class); public RelatorioDevolucaoBilhetes(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java index bd6d053c8..3bd9b54d0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java @@ -8,7 +8,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; @@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetesConsolidado.class); + private static Logger log = LogManager.getLogger(RelatorioDevolucaoBilhetesConsolidado.class); public RelatorioDevolucaoBilhetesConsolidado(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java index 6e674745f..014339212 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java @@ -8,7 +8,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Estado; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; @@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetesFinanceiro.class); + private static Logger log = LogManager.getLogger(RelatorioDevolucaoBilhetesFinanceiro.class); public RelatorioDevolucaoBilhetesFinanceiro(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java index 6c39b14f2..3b8c10d93 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java @@ -10,7 +10,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; @@ -25,7 +26,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioFinanceiroAnalitico extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioFinanceiroAnalitico.class); + private static Logger log = LogManager.getLogger(RelatorioFinanceiroAnalitico.class); List listdata = null; @SuppressWarnings("unchecked") diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java index dc0793b56..3bbaa2822 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java @@ -11,7 +11,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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estado; @@ -28,7 +29,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioFinanceiroSintetico extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioFinanceiroSintetico.class); + private static Logger log = LogManager.getLogger(RelatorioFinanceiroSintetico.class); List listdata = null; @SuppressWarnings("unchecked") diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java index 3e515af8f..5f1e0c072 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -9,7 +9,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Aidf; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioFolioRmd extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioFolioRmd.class); + private static Logger log = LogManager.getLogger(RelatorioFolioRmd.class); List listdata = null; private static final String DATE_FORMAT_FISCAL = "yyyyMMdd"; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java index 41624fd70..f2c458cf5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioGratuidadeAGER extends Relatorio { private List lsDadosRelatorio; - private static Logger log = Logger.getLogger(RelatorioGratuidadeAGER.class); + private static Logger log = LogManager.getLogger(RelatorioGratuidadeAGER.class); public RelatorioGratuidadeAGER(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java index 4aa61616a..4c310f535 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java @@ -9,7 +9,8 @@ import java.util.Map; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioGratuidadeARTESP extends Relatorio { private List lsDadosRelatorio; - private static Logger log = Logger.getLogger(RelatorioGratuidadeARTESP.class); + private static Logger log = LogManager.getLogger(RelatorioGratuidadeARTESP.class); public RelatorioGratuidadeARTESP(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java index 957a1338c..6cbd044f8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java @@ -15,7 +15,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; @@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioIndiceIRK extends Relatorio { private List lsDadosRelatorio; - private static Logger log = Logger.getLogger(RelatorioIndiceIRK.class); + private static Logger log = LogManager.getLogger(RelatorioIndiceIRK.class); /** diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java index f395734bb..98fff8ee9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -13,7 +13,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.Corrida; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -31,7 +32,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @SuppressWarnings({"unused", "unchecked"}) public class RelatorioLinhasHorario extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioLinhasHorario.class); + private static Logger log = LogManager.getLogger(RelatorioLinhasHorario.class); private List lsDadosRelatorio; private static String CONSTANTE_GRATUIDADE_CRIANCA; private BigDecimal CENTO = BigDecimal.TEN.multiply(BigDecimal.TEN); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java index cac534421..363e7777d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java @@ -13,7 +13,8 @@ import java.util.Date; 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.zkoss.web.servlet.dsp.action.If; import com.rjconsultores.ventaboletos.entidad.Corrida; @@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @SuppressWarnings({"unused", "unchecked"}) public class RelatorioLinhasHorarioSimpData extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioLinhasHorarioSimpData.class); + private static Logger log = LogManager.getLogger(RelatorioLinhasHorarioSimpData.class); private List lsDadosRelatorio; private static String CONSTANTE_GRATUIDADE_CRIANCA; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java index b790064d3..d0cb34390 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java @@ -13,7 +13,8 @@ import java.util.Date; 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.zkoss.web.servlet.dsp.action.If; import com.rjconsultores.ventaboletos.entidad.Corrida; @@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; @SuppressWarnings({"unused", "unchecked"}) public class RelatorioLinhasHorarioSimplificado extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioLinhasHorarioSimplificado.class); + private static Logger log = LogManager.getLogger(RelatorioLinhasHorarioSimplificado.class); private List lsDadosRelatorio; private static String CONSTANTE_GRATUIDADE_CRIANCA; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java index 7677a6eb5..5f4dd015a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java @@ -11,7 +11,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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; @@ -25,7 +26,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioMensalDAER extends Relatorio { private List lsDadosRelatorio; - private static Logger log = Logger.getLogger(RelatorioMensalDAER.class); + private static Logger log = LogManager.getLogger(RelatorioMensalDAER.class); /** * @param parametros diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java index f83375a19..30f0fd079 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java @@ -6,7 +6,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -17,7 +18,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioMovimentacaoEstoque extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioMovimentacaoEstoque.class); + private static Logger log = LogManager.getLogger(RelatorioMovimentacaoEstoque.class); List list = null; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java index 2424fbf98..1f32776fb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java @@ -16,7 +16,8 @@ import java.util.Set; import java.util.TreeSet; 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.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -29,7 +30,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioMovimentosAtraso extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioMovimentosAtraso.class); + private static Logger log = LogManager.getLogger(RelatorioMovimentosAtraso.class); private Integer empresaId; private Integer puntoventaId; private Date dataInicial; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java index 486035aed..a7017c4f4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java @@ -9,7 +9,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioObservacaoBilhetes extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioObservacaoBilhetes.class); + private static Logger log = LogManager.getLogger(RelatorioObservacaoBilhetes.class); private Integer empresaId; private Integer puntoventaId; private Date dataInicial; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java index 1c05b10cc..32138d37c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java @@ -9,7 +9,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioObservacaoConferenciaMovimento extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioObservacaoConferenciaMovimento.class); + private static Logger log = LogManager.getLogger(RelatorioObservacaoConferenciaMovimento.class); private Integer empresaId; private Integer puntoventaId; private Date dataInicial; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java index f9f647802..9fe143cb6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java @@ -9,7 +9,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioObservacaoEventosFinanceiros extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioObservacaoEventosFinanceiros.class); + private static Logger log = LogManager.getLogger(RelatorioObservacaoEventosFinanceiros.class); private Integer empresaId; private Integer puntoventaId; private Date dataInicial; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java index ba2408ea9..b1eb49306 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioOperacionalFinanceiro extends Relatorio { private List lsDadosRelatorio; - private static Logger log = Logger.getLogger(RelatorioOperacionalFinanceiro.class); + private static Logger log = LogManager.getLogger(RelatorioOperacionalFinanceiro.class); public RelatorioOperacionalFinanceiro(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java index bbf64209d..655fcfe6b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java @@ -13,7 +13,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 com.rjconsultores.ventaboletos.entidad.Constante; import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida; @@ -30,7 +31,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioOrigemDestino extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioOrigemDestino.class); + private static Logger log = LogManager.getLogger(RelatorioOrigemDestino.class); private static String CONSTANTE_GRATUIDADE_CRIANCA; private List listaBean = new ArrayList(); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java index 6a7c52a9c..3d1daee54 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioPassagensAGER extends Relatorio { private List lsDadosRelatorio; - private static Logger log = Logger.getLogger(RelatorioPassagensAGER.class); + private static Logger log = LogManager.getLogger(RelatorioPassagensAGER.class); public RelatorioPassagensAGER(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java index 0b8737246..12cf7aad8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java @@ -10,7 +10,8 @@ import java.util.Iterator; 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.zkoss.zul.Filedownload; import org.zkoss.zul.Listcell; import org.zkoss.zul.Listhead; @@ -56,7 +57,7 @@ import net.sf.jasperreports.engine.type.WhenNoDataTypeEnum; public class RelatorioPdfAndExcel { -// private static Logger log = Logger.getLogger(RelatorioDispositivoEmbarcada.class); +// private static Logger log = LogManager.getLogger(RelatorioDispositivoEmbarcada.class); public MyListbox dispositivoVendaEmbarcadaList; public RelatorioPdfAndExcel(final MyListbox dispositivoVendaEmbarcadaList) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java index 315a17109..8acf268c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java @@ -11,7 +11,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioSegundaVia extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioSegundaVia.class); + private static Logger log = LogManager.getLogger(RelatorioSegundaVia.class); private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java index f1328d635..7a7f7af78 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java @@ -11,7 +11,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioSegundaViaBoleto extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioSegundaVia.class); + private static Logger log = LogManager.getLogger(RelatorioSegundaVia.class); private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java index fa23699e1..8572074a5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java @@ -11,7 +11,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioSegundaViaSeguroOpcional extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioSegundaViaSeguroOpcional.class); + private static Logger log = LogManager.getLogger(RelatorioSegundaViaSeguroOpcional.class); private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java index cd02ad0f7..b8a948128 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java @@ -9,7 +9,8 @@ import java.util.HashMap; 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 com.rjconsultores.ventaboletos.constantes.Constantes.FiltroEnviadosSefaz; import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource; @@ -32,7 +33,7 @@ public class RelatorioVendaEmbarcada extends Relatorio { private Boolean quebraSequencia; private Boolean ultimoBpe; - private static Logger log = Logger.getLogger(RelatorioVendaEmbarcada.class); + private static Logger log = LogManager.getLogger(RelatorioVendaEmbarcada.class); public RelatorioVendaEmbarcada(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java index 6b0560396..a4584fb19 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java @@ -12,7 +12,8 @@ import java.util.Map; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; 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.enums.LocalEnderecoApanhe; @@ -26,7 +27,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioVendaPacoteVoucher extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendaPacoteVoucher.class); + private static Logger log = LogManager.getLogger(RelatorioVendaPacoteVoucher.class); private List lsPacoteVoucher; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java index b8c138017..f3f36397a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java @@ -8,7 +8,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estacion; @@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasCartoes extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasCartoes.class); + private static Logger log = LogManager.getLogger(RelatorioVendasCartoes.class); List list = null; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java index c59b0ab9c..3662373a1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Estacion; @@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasCartoesAlternativo extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasCartoesAlternativo.class); + private static Logger log = LogManager.getLogger(RelatorioVendasCartoesAlternativo.class); List list = null; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java index 72d089945..513177d97 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -10,7 +10,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 com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; @@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasComissao extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasComissao.class); + private static Logger log = LogManager.getLogger(RelatorioVendasComissao.class); private List lsDadosRelatorio; private List lsDadosRelatorioCancelamento; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java index f625cb9ec..62f734c46 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java @@ -10,7 +10,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 com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; @@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasComissaoEstavel extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasComissaoEstavel.class); + private static Logger log = LogManager.getLogger(RelatorioVendasComissaoEstavel.class); private List lsDadosRelatorio; private List lsDadosRelatorioCancelamento; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java index ed8963ddd..c06f37700 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java @@ -8,7 +8,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasConexao extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasConexao.class); + private static Logger log = LogManager.getLogger(RelatorioVendasConexao.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java index 97da26cbc..d890f9ffe 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java @@ -10,7 +10,8 @@ import java.util.Date; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasConexaoRuta extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasConexaoRuta.class); + private static Logger log = LogManager.getLogger(RelatorioVendasConexaoRuta.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java index f3f223a8a..afae52209 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java @@ -9,7 +9,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; @@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasPacotesBoletos extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasPacotesBoletos.class); + private static Logger log = LogManager.getLogger(RelatorioVendasPacotesBoletos.class); public static final Integer VENDIDOS = 1; public static final Integer CANCELADOS = 0; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java index f28bac379..4ab37126b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -10,7 +10,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 com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe; import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote; @@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasPacotesDetalhado extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasPacotesDetalhado.class); + private static Logger log = LogManager.getLogger(RelatorioVendasPacotesDetalhado.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java index 73a0fc789..6e94aa361 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java @@ -9,7 +9,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasPacotesResumido extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasPacotesResumido.class); + private static Logger log = LogManager.getLogger(RelatorioVendasPacotesResumido.class); private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java index 915e8645d..aff69fea1 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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 com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -18,7 +19,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasRequisicao extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioVendasRequisicao.class); + private static Logger log = LogManager.getLogger(RelatorioVendasRequisicao.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java index 11eab0ab3..a500b53bb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java @@ -6,7 +6,8 @@ import java.util.Locale; import java.util.ResourceBundle; 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.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio; @@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.util.JRProperties; @SuppressWarnings("deprecation") public class RenderRelatorioJasper { - private static Logger log = Logger.getLogger(Relatorio.class); + private static Logger log = LogManager.getLogger(Relatorio.class); protected JasperPrint jasperPrint; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java index a36263587..539960308 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java @@ -8,7 +8,8 @@ import java.util.ArrayList; 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 net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRField; @@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.JRField; */ public class ArrayDataSource implements IDataSource { - private static Logger log = Logger.getLogger(ArrayDataSource.class); + private static Logger log = LogManager.getLogger(ArrayDataSource.class); protected Relatorio relatorio; protected ResultSet resultSet; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java index b262db4c5..ba211159c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java @@ -9,7 +9,8 @@ import java.sql.SQLException; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JRField; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author Bruno H. G. Gouvea @@ -17,7 +18,7 @@ import org.apache.log4j.Logger; */ public class DataSource implements IDataSource { - private static Logger log = Logger.getLogger(DataSource.class); + private static Logger log = LogManager.getLogger(DataSource.class); protected Relatorio relatorio; protected ResultSet resultSet; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java index 01511aa71..e9689d2c5 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java @@ -5,7 +5,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.relatorios.render.RenderRelatorioJasper; @@ -17,7 +18,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; */ public abstract class Relatorio { - private static Logger log = Logger.getLogger(Relatorio.class); + private static Logger log = LogManager.getLogger(Relatorio.class); private static final String DEFAULT_BASE_DIR = "/com/rjconsultores/ventaboletos/relatorios"; private static final String FILTRO_POR_TODOS = "-1"; diff --git a/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java b/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java index 6e1fe5e6d..9cf40811e 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java @@ -8,7 +8,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.rest.bean.ParamsSincronizarTramo; import com.rjconsultores.ventaboletos.rest.service.SincronizarTramoService; @@ -18,7 +19,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Path("/sincronizarTramos") public class SincronizarTramos { - private static Logger log = Logger.getLogger(SincronizarTramos.class); + private static Logger log = LogManager.getLogger(SincronizarTramos.class); @POST @Consumes({ MediaType.APPLICATION_JSON }) diff --git a/src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java b/src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java index 19900fd9a..2aa38871a 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java @@ -5,7 +5,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.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.vo.pricing.Pricing; @Service("alteraPricingService") public class AlteraPricingService { - private static Logger log = Logger.getLogger(AlteraPricingService.class); + private static Logger log = LogManager.getLogger(AlteraPricingService.class); @Autowired PricingService pricingService; diff --git a/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java b/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java index 9f5636a7d..87c8ab26c 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.rest.service; -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.web.utilerias.spring.AppContext; @Service("ultimaSincronizacaoService") public class UltimaSincronizacaoService { - private static Logger log = Logger.getLogger(UltimaSincronizacaoService.class); + private static Logger log = LogManager.getLogger(UltimaSincronizacaoService.class); @Autowired private SincronizarService sincronizarService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridCombinacionTramoRutaCoeficiente.java b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridCombinacionTramoRutaCoeficiente.java index 5564c0048..c54e9ea2b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridCombinacionTramoRutaCoeficiente.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridCombinacionTramoRutaCoeficiente.java @@ -5,7 +5,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.zkoss.util.resource.Labels; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; @@ -55,7 +56,7 @@ public class GridCombinacionTramoRutaCoeficiente extends Grid implements RowRend private ClaseServicio claseServicio; private OrgaoConcedente orgaoConcedente; private DataBinder dataBinder; - private static Logger log = Logger.getLogger(GridCombinacionTramoRutaCoeficiente.class); + private static Logger log = LogManager.getLogger(GridCombinacionTramoRutaCoeficiente.class); public GridCombinacionTramoRutaCoeficiente() { lsSecuenciaRutaTramoCoeficienteVO = new ArrayList(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramo.java b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramo.java index 3f113b45d..a0caf9006 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramo.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramo.java @@ -7,7 +7,8 @@ import java.util.LinkedHashMap; 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.zkoss.util.resource.Labels; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; @@ -54,7 +55,7 @@ public class GridRutaTramo extends Grid implements RowRenderer, RendererCtrl { private ClaseServicio claseServicio; private DataBinder dataBinder; private boolean mostraPopupGrid; - private static Logger log = Logger.getLogger(GridRutaTramo.class); + private static Logger log = LogManager.getLogger(GridRutaTramo.class); private boolean isPrimeiraVia; public GridRutaTramo() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java index c06af6b3b..a6de02eb1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java @@ -5,7 +5,8 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.BooleanUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; @@ -60,7 +61,7 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende private ClaseServicio claseServicio; private OrgaoConcedente orgaoConcedente; private DataBinder dataBinder; - private static Logger log = Logger.getLogger(GridRutaTramoCoeficiente.class); + private static Logger log = LogManager.getLogger(GridRutaTramoCoeficiente.class); public GridRutaTramoCoeficiente() { lsSecuenciaRutaTramoCoeficienteVO = new ArrayList(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java index 63ae475cb..88b80e917 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java @@ -11,7 +11,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaBpeExportacaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaBpeExportacaoController.class); + private static Logger log = LogManager.getLogger(BusquedaBpeExportacaoController.class); @Autowired private BpeService bpeService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java index edb880fd8..e9192a3ac 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java @@ -7,7 +7,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEstadoUf; public class BusquedaBpeRdiController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaBpeRdiController.class); + private static Logger log = LogManager.getLogger(BusquedaBpeRdiController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java index e00442b6c..fa03ee803 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java @@ -13,7 +13,8 @@ import java.util.Map; import java.util.Map.Entry; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -71,7 +72,7 @@ public class BusquedaConfTotemController extends MyGenericForwardComposer { private Checkbox chktListarPassageiroUltimaPoltrona; private Checkbox chkPermitirVendaRapida; private Checkbox chkIndImprime2Via; - private static Logger log = Logger.getLogger(BusquedaConfTotemController.class); + private static Logger log = LogManager.getLogger(BusquedaConfTotemController.class); private MyListbox empresaList; private MyListbox bandeirasList; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaHotelController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaHotelController.java index 688be0414..de176348d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaHotelController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaHotelController.java @@ -30,7 +30,7 @@ public class BusquedaHotelController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaHotelController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaHotelController.class); @Autowired private transient PagedListWrapper plwHotel; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaPacoteConvenioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaPacoteConvenioController.java index ca615fbe0..a3f68e342 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaPacoteConvenioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaPacoteConvenioController.java @@ -30,7 +30,7 @@ public class BusquedaPacoteConvenioController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaPacoteConvenioController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaPacoteConvenioController.class); @Autowired private transient PagedListWrapper plwPacoteConvenio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarArticuloController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarArticuloController.java index 66030e345..3a5b79992 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarArticuloController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarArticuloController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ public class EditarArticuloController extends MyGenericForwardComposer { private MyListbox articuloList; private Button btnApagar; private MyTextbox txtNome; - private static Logger log = Logger.getLogger(EditarArticuloController.class); + private static Logger log = LogManager.getLogger(EditarArticuloController.class); public Articulo getArticulo() { return articulo; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAsociacionClaseServicioMarcaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAsociacionClaseServicioMarcaController.java index 1e905a99c..4abeaf701 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAsociacionClaseServicioMarcaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAsociacionClaseServicioMarcaController.java @@ -15,7 +15,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -48,8 +49,7 @@ public class EditarAsociacionClaseServicioMarcaController extends MyGenericForwa private Combobox cmbMarca; private Combobox cmbClaseServicio; private Button btnApagar; - private static Logger log = - Logger.getLogger(EditarAsociacionClaseServicioMarcaController.class); + private static final Logger log = LogManager.getLogger(EditarAsociacionClaseServicioMarcaController.class); public List getLsClaseServicios() { return lsClaseServicios; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAutorizacaoUsoSerieEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAutorizacaoUsoSerieEmbarcadaController.java index db05425c5..bc3a2f62a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAutorizacaoUsoSerieEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAutorizacaoUsoSerieEmbarcadaController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarAutorizacaoUsoSerieEmbarcadaController extends MyGenericForwardComposer { private static final long serialVersionUID = 3681643325026575959L; - private static Logger log = Logger.getLogger(EditarAutorizacaoUsoSerieEmbarcadaController.class); + private static Logger log = LogManager.getLogger(EditarAutorizacaoUsoSerieEmbarcadaController.class); @Autowired private EstadoService estadoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCategoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCategoriaController.java index a8e74a9a4..df58e61e4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCategoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCategoriaController.java @@ -8,7 +8,8 @@ import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -51,7 +52,7 @@ public class EditarCategoriaController extends MyGenericForwardComposer { private MyListbox categoriaList; private Button btnApagar; private Button btnSalvar; - private static Logger log = Logger.getLogger(EditarCategoriaController.class); + private static Logger log = LogManager.getLogger(EditarCategoriaController.class); private MyTextbox txtNome; private MyTextbox txtCvecategoria; private MyTextbox txtDescImpresionGratuidade; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCiudadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCiudadController.java index 9b1c6e9bd..225387b4b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCiudadController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCiudadController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -47,7 +48,7 @@ public class EditarCiudadController extends MyGenericForwardComposer { private List lsEstado; private Ciudad ciudad; private MyListbox ciudadList; - private static Logger log = Logger.getLogger(EditarCiudadController.class); + private static Logger log = LogManager.getLogger(EditarCiudadController.class); private MyTextbox txtNome; private Combobox cmbEstado; private Button btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarClaseServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarClaseServicioController.java index c990c255a..c8ce002ee 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarClaseServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarClaseServicioController.java @@ -9,7 +9,8 @@ import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; public class EditarClaseServicioController extends MyGenericForwardComposer { private static final long serialVersionUID = 578894379723590151L; - private static Logger log = Logger.getLogger(EditarClaseServicioController.class); + private static Logger log = LogManager.getLogger(EditarClaseServicioController.class); @Autowired private ClaseServicioService claseServicioService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java index d5b227b71..6a8066b61 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -47,7 +48,7 @@ public class EditarColoniaController extends MyGenericForwardComposer { private ColoniaService coloniaService; private Colonia colonia; private MyListbox coloniaList; - private static Logger log = Logger.getLogger(EditarColoniaController.class); + private static Logger log = LogManager.getLogger(EditarColoniaController.class); private MyTextbox txtNome; private Button btnApagar; private MyComboboxCiudad cmbCiudad; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.java index d8078ccc5..d549bfd61 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -50,7 +51,7 @@ public class EditarConfTotemController extends MyGenericForwardComposer { private Combobox cmbSistema; private List lsSistemaEnum; - private static Logger log = Logger.getLogger(EditarCustomController.class); + private static Logger log = LogManager.getLogger(EditarCustomController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemVentaRapidaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemVentaRapidaController.java index 9693c0ed1..4032b6c2e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemVentaRapidaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemVentaRapidaController.java @@ -9,7 +9,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ public class EditarConfTotemVentaRapidaController extends MyGenericForwardCompos */ private static final long serialVersionUID = 1L; @Autowired - private static Logger log = Logger.getLogger(EditarConfTotemVentaRapidaController.class); + private static Logger log = LogManager.getLogger(EditarConfTotemVentaRapidaController.class); private MyComboboxParada cmbParadaOrigem; private MyListbox localidadesDestinoList; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaBancariaEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaBancariaEmpresaController.java index 3d60b4fbb..20602c1ee 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaBancariaEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaBancariaEmpresaController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -24,7 +25,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarContaBancariaEmpresaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarContaBancariaEmpresaController.class); + private static Logger log = LogManager.getLogger(EditarContaBancariaEmpresaController.class); @Autowired private InstiFinanceiraService instFinanceiraService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaMDController.java index 46af907ca..b365caa11 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaMDController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaMDController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; import java.util.Calendar; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxSimple; public class EditarContaMDController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarContaMDController.class); + private static Logger log = LogManager.getLogger(EditarContaMDController.class); @Autowired private ContaMDService contaMDService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCuponConvenioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCuponConvenioController.java index a77b6b9fd..9b0a9628d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCuponConvenioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCuponConvenioController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarCuponConvenioController extends MyGenericForwardComposer { private Intbox folioInicio; private Intbox folioFin; private List tipoConvenioList; - private static Logger log = Logger.getLogger(EditarCuponConvenioController.class); + private static Logger log = LogManager.getLogger(EditarCuponConvenioController.class); public Combobox getCmbTipoConvenio() { return cmbTipoConvenio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCursoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCursoController.java index d08096eb1..78bc7c362 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCursoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCursoController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -31,7 +32,7 @@ public class EditarCursoController extends MyGenericForwardComposer { private CursoService CursoService; private Curso curso; private MyListbox cursoList; - private static Logger log = Logger.getLogger(EditarCursoController.class); + private static Logger log = LogManager.getLogger(EditarCursoController.class); private MyTextbox txtNome; private Button btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomController.java index 0b30436a1..e6daa46c4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomController.java @@ -8,7 +8,8 @@ import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -51,7 +52,7 @@ public class EditarCustomController extends MyGenericForwardComposer { private List lsSistemaEnum; private List lsTipoEnum; - private static Logger log = Logger.getLogger(EditarCustomController.class); + private static Logger log = LogManager.getLogger(EditarCustomController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomUploadArquivoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomUploadArquivoController.java index 27c932169..8af673e1d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomUploadArquivoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomUploadArquivoController.java @@ -8,7 +8,8 @@ import java.util.Arrays; import java.util.List; import java.util.Properties; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -52,7 +53,7 @@ public class EditarCustomUploadArquivoController extends MyGenericForwardCompose private Checkbox chkSubstituirExistente; private Label lbNomeArquivo; - private static Logger log = Logger.getLogger(EditarCustomUploadArquivoController.class); + private static Logger log = LogManager.getLogger(EditarCustomUploadArquivoController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDetDiagramaAutobusController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDetDiagramaAutobusController.java index f157341f3..dcc094271 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDetDiagramaAutobusController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDetDiagramaAutobusController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -56,7 +57,7 @@ public class EditarDetDiagramaAutobusController extends MyGenericForwardComposer private Comboitem cbiWest; private Comboitem cbiEast; private Comboitem cbiSouth; - private static Logger log = Logger.getLogger(EditarDetDiagramaAutobusController.class); + private static Logger log = LogManager.getLogger(EditarDetDiagramaAutobusController.class); public final static String ASIENTO = "ASIENTO"; private String itemCombo = ASIENTO; private String itemOrientacion = DetDiagramaAutobus.ORIENTACION_W; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDispositivoVendaEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDispositivoVendaEmbarcadaController.java index 08aeab190..33f57e5d8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDispositivoVendaEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDispositivoVendaEmbarcadaController.java @@ -9,7 +9,8 @@ import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -85,7 +86,7 @@ public class EditarDispositivoVendaEmbarcadaController extends MyGenericForwardC private String motivoManutencao; private String motivoBaixado; private boolean isNovoDispositivo; - private static Logger log = Logger.getLogger(EditarDispositivoVendaEmbarcadaController.class); + private static Logger log = LogManager.getLogger(EditarDispositivoVendaEmbarcadaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpleadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpleadoController.java index c64ab3ba6..f56c4d1d7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpleadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpleadoController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @Scope("prototype") public class EditarEmpleadoController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarEmpleadoController.class); + private static Logger log = LogManager.getLogger(EditarEmpleadoController.class); private MyTextbox txtCveEmpleado; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java index 687a2fa48..5c34de2ae 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java @@ -35,7 +35,8 @@ import java.util.regex.Pattern; 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.brazilutils.br.cpfcnpj.Cnpj; import org.brazilutils.br.cpfcnpj.Cpf; import org.brazilutils.validation.ValidationException; @@ -146,7 +147,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.security.SecurityEmpresaToke public class EditarEmpresaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarEmpresaController.class); + private static Logger log = LogManager.getLogger(EditarEmpresaController.class); @Autowired private EmpresaService empresaService; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java index 434e630ba..c4aaf01e3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java @@ -8,7 +8,8 @@ import java.math.BigDecimal; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderAliquotaEstadoD public class EditarEmpresaImpostoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarEmpresaImpostoController.class); + private static Logger log = LogManager.getLogger(EditarEmpresaImpostoController.class); private EmpresaImposto empresaImposto; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaInscricaoEstadualController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaInscricaoEstadualController.java index 845f05c3f..dd215b602 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaInscricaoEstadualController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaInscricaoEstadualController.java @@ -5,7 +5,8 @@ import java.util.List; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -47,7 +48,7 @@ public class EditarEmpresaInscricaoEstadualController extends MyGenericForwardCo private static final long serialVersionUID = 1L; @SuppressWarnings("unused") - private static Logger log = Logger.getLogger(EditarEmpresaInscricaoEstadualController.class); + private static Logger log = LogManager.getLogger(EditarEmpresaInscricaoEstadualController.class); @Autowired private EmpresaService empresaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java index cbf38f163..1d9f7c0c5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ public class EditarEscolaController extends MyGenericForwardComposer { private EscolaService EscolaService; private Escola escola; private MyListbox escolaList; - private static Logger log = Logger.getLogger(EditarEscolaController.class); + private static Logger log = LogManager.getLogger(EditarEscolaController.class); private MyTextbox txtNome; private MyComboboxCiudad cmbCiudad; private Button btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java index e892081a0..e64380991 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java @@ -8,7 +8,8 @@ import java.util.Calendar; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -52,7 +53,7 @@ public class EditarEstadoController extends MyGenericForwardComposer { private Estado estado; private List lsPais; private MyListbox estadoList; - private static Logger log = Logger.getLogger(EditarEstadoController.class); + private static Logger log = LogManager.getLogger(EditarEstadoController.class); private MyTextbox txtNome; private MyTextbox txtUf; private Combobox cmbPais; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java index e1be02576..35406512e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java @@ -8,7 +8,8 @@ import java.util.Calendar; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -65,7 +66,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer { private Radio rd4; private Radio radioImp; private Radio radioPor; - private static Logger log = Logger.getLogger(EditarFormaPagoController.class); + private static Logger log = LogManager.getLogger(EditarFormaPagoController.class); private Row rowEquivalencia; private Row rowRestricaoFormaPago; private Row rowTransferenciaReativacao; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoCategoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoCategoriaController.java index 6468a2eb9..937b0d494 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoCategoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoCategoriaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ public class EditarGrupoCategoriaController extends MyGenericForwardComposer { private GrupoCategoria grupoCategoria; private MyListbox grupoCategoriaList; - private static Logger log = Logger.getLogger(EditarGrupoCategoriaController.class); + private static Logger log = LogManager.getLogger(EditarGrupoCategoriaController.class); private MyTextbox txtDesc; private BusquedaGrupoCategoriaController busquedaGrupoCategoriaController; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoRutaController.java index dc13772ac..5f076ea39 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoRutaController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarGrupoRutaController extends MyGenericForwardComposer { private MyListbox grupoRutaList; private MyTextbox txtNome; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarGrupoRutaController.class); + private static Logger log = LogManager.getLogger(EditarGrupoRutaController.class); public GrupoRuta getGrupoRuta() { return grupoRuta; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java index 121ae35c9..c52af33a8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -25,7 +26,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @Scope("prototype") public class EditarHotelController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarHotelController.class); + private static Logger log = LogManager.getLogger(EditarHotelController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImagemController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImagemController.java index 25288f2e4..3bd030283 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImagemController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImagemController.java @@ -15,7 +15,8 @@ import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -59,7 +60,7 @@ public class EditarImagemController extends MyGenericForwardComposer { private Image img; private MyTextbox txtNome; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarImagemController.class); + private static Logger log = LogManager.getLogger(EditarImagemController.class); private Combobox cmbEmpresa; @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMarcaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMarcaController.java index 5bc570daf..81163b131 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMarcaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMarcaController.java @@ -17,7 +17,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; import java.io.IOException; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -53,7 +54,7 @@ public class EditarMarcaController extends MyGenericForwardComposer { private Image img; private MyTextbox txtNome; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarMarcaController.class); + private static Logger log = LogManager.getLogger(EditarMarcaController.class); private Row rowEquivalencia; private Combobox cmbEmpresa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMensagemRecusaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMensagemRecusaController.java index e58c8fc5f..69684a1bc 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMensagemRecusaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMensagemRecusaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.zkoss.zul.Textbox; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -29,7 +30,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarMensagemRecusaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarMensagemRecusaController.class); + private static Logger log = LogManager.getLogger(EditarMensagemRecusaController.class); private MensagemRecusa mensagemRecusa; private BusquedaMensagemRecusaController busquedaMensagemRecusaController; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java index 6151d91a6..f759bf08b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ public class EditarMonedaController extends MyGenericForwardComposer { private Button btnApagar; private Button btnSalvar; private BusquedaMonedaController busquedaMonedaController; - private static Logger log = Logger.getLogger(EditarMonedaController.class); + private static Logger log = LogManager.getLogger(EditarMonedaController.class); private MyTextbox txtNome; private MyTextbox txtSimbolo; private Row rowEquivalencia; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java index 3a9c3904c..b595b6251 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java @@ -4,7 +4,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -85,7 +86,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer { private Radio rdSomenteCartao; private Radio rdTodasFormasPagamento; - private static Logger log = Logger.getLogger(EditarOCDParamController.class); + private static Logger log = LogManager.getLogger(EditarOCDParamController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOperadoresDispositivoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOperadoresDispositivoController.java index 4510d34d3..1ada82b31 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOperadoresDispositivoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOperadoresDispositivoController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderUsuarioDisposit public class EditarOperadoresDispositivoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarOperadoresDispositivoController.class); + private static Logger log = LogManager.getLogger(EditarOperadoresDispositivoController.class); /** * ListBox dos usuários que estáo atrelados ao dispositivo diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPacoteConvenioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPacoteConvenioController.java index 31dc5d54c..8836c01a9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPacoteConvenioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPacoteConvenioController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -24,7 +25,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @Scope("prototype") public class EditarPacoteConvenioController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarPacoteConvenioController.class); + private static Logger log = LogManager.getLogger(EditarPacoteConvenioController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPaisController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPaisController.java index 9b1ea4aac..3241fe5ab 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPaisController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPaisController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarPaisController extends MyGenericForwardComposer { private Button btnApagar; private Button btnSalvar; private BusquedaPaisController busquedaPaisController; - private static Logger log = Logger.getLogger(EditarPaisController.class); + private static Logger log = LogManager.getLogger(EditarPaisController.class); private MyTextbox txtNome; private MyTextbox txtCodigoBacen; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPlazaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPlazaController.java index dd5e286bd..f09c26191 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPlazaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPlazaController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ public class EditarPlazaController extends MyGenericForwardComposer { private MyListbox plazaList; private Button btnApagar; private MyTextbox txtNome; - private static Logger log = Logger.getLogger(EditarPlazaController.class); + private static Logger log = LogManager.getLogger(EditarPlazaController.class); public Plaza getPlaza() { return plaza; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarProductoServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarProductoServicioController.java index 0ade535af..8d5eebd5f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarProductoServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarProductoServicioController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -46,7 +47,7 @@ public class EditarProductoServicioController extends MyGenericForwardComposer { private Radio rdProducto; private Radio rdServicio; private List lsEmpresa; - private static Logger log = Logger.getLogger(EditarProductoServicioController.class); + private static Logger log = LogManager.getLogger(EditarProductoServicioController.class); public MyListbox getPSList() { return PSList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java index 4d29a7940..a82e681ed 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaAntifraudeController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ public class EditarPtovtaAntifraudeController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPtovtaAntifraudeController.class); + private static Logger log = LogManager.getLogger(EditarPtovtaAntifraudeController.class); @Autowired private PtovtaAntifraudeService ptovtaAntifraudeService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaEmpresaController.java index d3359fdea..88da7c45f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPtovtaEmpresaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.service.PuntoVentaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ public class EditarPtovtaEmpresaController extends MyGenericForwardComposer { private PtovtaEmpresa ptovtaEmpresa; private MyListbox ptovtaEmpresaList; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarPtovtaEmpresaController.class); + private static Logger log = LogManager.getLogger(EditarPtovtaEmpresaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java index 0782a6d73..76e25f12b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaComissaoController.java @@ -10,7 +10,8 @@ import java.util.Date; import java.util.List; import java.util.Locale; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -64,7 +65,7 @@ public class EditarPuntoVentaComissaoController extends MyGenericForwardComposer private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPuntoVentaComissaoController.class); + private static Logger log = LogManager.getLogger(EditarPuntoVentaComissaoController.class); private static final Locale LOC = new Locale("pt","br"); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java index 1d5618fca..395efa066 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java @@ -39,7 +39,8 @@ import javax.swing.text.MaskFormatter; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -210,7 +211,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPuntoVentaController.class); + private static Logger log = LogManager.getLogger(EditarPuntoVentaController.class); public static final String FUNCION_TIPO_BOLETO_BLOQUEADO = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.TIPOBOLETOBLOQUEADO"; public static final String FUNCION_COBRANCA_ADICIONAL = "COM.RJCONSULTORES.ADMINISTRACION.PUNTOVENTA.COBRANCAADICIONAL"; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaMotivoFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaMotivoFormaPagoController.java index a4e8cd565..5b32f3cb1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaMotivoFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaMotivoFormaPagoController.java @@ -9,7 +9,8 @@ import java.util.Calendar; import java.util.List; import org.apache.commons.lang.BooleanUtils; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ public class EditarPuntoVentaMotivoFormaPagoController extends MyGenericForwardC private Integer empresaId; private Button btnApagar; private MyTextbox txtMotivo; - private static Logger log = Logger.getLogger(EditarPuntoVentaMotivoFormaPagoController.class); + private static Logger log = LogManager.getLogger(EditarPuntoVentaMotivoFormaPagoController.class); private MyListbox formaPagoList; private MyListbox ptovtaHistoricoFormaPagoList; private FormaPagoDet formaPagoDet; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java index 3f1463765..eeeb668b5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarRegionMetropolitanaController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderParadaRegionMet public class EditarRegionMetropolitanaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarRegionMetropolitanaController.class); + private static Logger log = LogManager.getLogger(EditarRegionMetropolitanaController.class); @Autowired private ParadaService paradaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoConvenioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoConvenioController.java index 4d2ea2ffd..28ccac6bf 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoConvenioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoConvenioController.java @@ -10,7 +10,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ public class EditarTipoConvenioController extends MyGenericForwardComposer { private TipoConvenio tc; private MyListbox tcList; private MyTextbox txtNome; - private static Logger log = Logger.getLogger(EditarTipoConvenioController.class); + private static Logger log = LogManager.getLogger(EditarTipoConvenioController.class); public TipoConvenio getTc() { return tc; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoCorteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoCorteController.java index 5c124bb6d..00a502e99 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoCorteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoCorteController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ public class EditarTipoCorteController extends MyGenericForwardComposer { private MyListbox tipoCorteList; private Button btnApagar; private MyTextbox txtNome; - private static Logger log = Logger.getLogger(EditarTipoCorteController.class); + private static Logger log = LogManager.getLogger(EditarTipoCorteController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoInformativoComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoInformativoComissaoController.java index 67429d055..8431ca0f5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoInformativoComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoInformativoComissaoController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -35,7 +36,7 @@ public class EditarTipoInformativoComissaoController extends MyGenericForwardCom private Button btnApagar; - private static Logger log = Logger.getLogger(EditarTipoInformativoComissaoController.class); + private static Logger log = LogManager.getLogger(EditarTipoInformativoComissaoController.class); public TipoInformativoComissao getTipoInformativoComissao() { return tipoInformativoComissao; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoPuntoVentaController.java index 0cf8babb7..a8320a27a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoPuntoVentaController.java @@ -20,7 +20,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCategoriaTipoPt 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -54,7 +55,7 @@ public class EditarTipoPuntoVentaController extends MyGenericForwardComposer { private TipoPuntoVenta tipoPuntoVenta; private MyListbox tipoPuntoVentaList; private MyTextbox txtNome; - private static Logger log = Logger.getLogger(EditarFormaPagoController.class); + private static Logger log = LogManager.getLogger(EditarFormaPagoController.class); private Button btnApagar; private Row rowEquivalencia; private Combobox cmbCategoria; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoServicioController.java index 3064e087e..0d599bca8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoServicioController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; public class EditarTipoServicioController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarTipoServicioController.class); + private static Logger log = LogManager.getLogger(EditarTipoServicioController.class); @Autowired private TipoServicioService tipoServicioService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoVentaController.java index c8f7e343a..8d6c04f7d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTipoVentaController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ public class EditarTipoVentaController extends MyGenericForwardComposer { private TipoVentaService tipoVentaService; private TipoVenta tipoVenta; private MyListbox tipoVentaList; - private static Logger log = Logger.getLogger(EditarTipoVentaController.class); + private static Logger log = LogManager.getLogger(EditarTipoVentaController.class); private MyTextbox txtNome; public TipoVenta getTipoVenta() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTurnoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTurnoController.java index b710d2530..8b2bdcdf8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTurnoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarTurnoController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ public class EditarTurnoController extends MyGenericForwardComposer { private MyListbox turnoList; private Button btnApagar; private MyTextbox txtNome; - private static Logger log = Logger.getLogger(EditarTurnoController.class); + private static Logger log = LogManager.getLogger(EditarTurnoController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/SearchMenuController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/SearchMenuController.java index 93a50cc71..983f4e51b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/SearchMenuController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/SearchMenuController.java @@ -11,7 +11,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.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.zkoss.zk.ui.Component; @@ -29,7 +30,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderSearchMenu; @Scope("prototype") public class SearchMenuController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(SearchMenuController.class); + private static Logger log = LogManager.getLogger(SearchMenuController.class); private HashMap menuItems; private MyListbox searchResultList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/ViewTestEmailController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/ViewTestEmailController.java index 58e33e428..c7463bf74 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/ViewTestEmailController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/ViewTestEmailController.java @@ -14,7 +14,8 @@ import javax.mail.MessagingException; import org.apache.commons.lang.NullArgumentException; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; @@ -42,7 +43,7 @@ public class ViewTestEmailController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(ViewTestEmailController.class); + private static Logger log = LogManager.getLogger(ViewTestEmailController.class); private MyListbox tarefasList; private MyListbox errosList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java index 9cf1aeb06..d5e8bc7b3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaCalculoComissaoController.java @@ -56,7 +56,7 @@ import com.rjconsultores.wsag.GeradorTitulosAG; public class BusquedaCalculoComissaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaCalculoComissaoController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaCalculoComissaoController.class); @Autowired private CalculoComissaoService calculoComissaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java index e74c2a63a..1ecae8190 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaConferenciaComissaoController.java @@ -9,7 +9,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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaConferenciaComissaoController extends MyGenericForwardComposer { private static final String TITULO = "conferenciaComissaoController.window.title"; - private static Logger log = Logger.getLogger(BusquedaConferenciaComissaoController.class); + private static Logger log = LogManager.getLogger(BusquedaConferenciaComissaoController.class); private static final long serialVersionUID = 1L; private Textbox txtCompetencia; private Datebox datInicial; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java index 5bcf17536..c19679a18 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaHistoricoComissaoController.java @@ -37,7 +37,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaHistoricoComissaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaHistoricoComissaoController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaHistoricoComissaoController.class); @Autowired private ComissaoService comissaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaItemDescontoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaItemDescontoController.java index fd5b82361..3f6c6480b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaItemDescontoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaItemDescontoController.java @@ -30,7 +30,7 @@ public class BusquedaItemDescontoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaItemDescontoController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaItemDescontoController.class); @Autowired private transient PagedListWrapper plwItemDesconto; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaRetencaoDiariaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaRetencaoDiariaComissaoController.java index fde76f021..a0c325b5f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaRetencaoDiariaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/BusquedaRetencaoDiariaComissaoController.java @@ -40,7 +40,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaRetencaoDiariaComissaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaRetencaoDiariaComissaoController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaRetencaoDiariaComissaoController.class); @Autowired private CalculoComissaoService calculoComissaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaComissaoController.java index 55f73c3c1..9c09c11c8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaComissaoController.java @@ -7,7 +7,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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ public class ConferenciaComissaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(ConferenciaComissaoController.class); + private static Logger log = LogManager.getLogger(ConferenciaComissaoController.class); @Autowired private ConferenciaComissaoService conferenciaComissaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java index 489ed8713..090c4330d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/ConferenciaController.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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -75,7 +76,7 @@ public class ConferenciaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(ConferenciaController.class); + private static Logger log = LogManager.getLogger(ConferenciaController.class); @Autowired private ConferenciaComissaoService conferenciaComissaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarItemDescontoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarItemDescontoController.java index dd8b043d3..2e6233bea 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarItemDescontoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarItemDescontoController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.comissao; import java.text.DecimalFormat; import java.util.Locale; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -28,7 +29,7 @@ public class EditarItemDescontoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = Logger.getLogger(EditarItemDescontoController.class); + private static Logger log = LogManager.getLogger(EditarItemDescontoController.class); private static final Locale LOC = new Locale("pt","br"); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java index d23aa93ce..87ad8312e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/EditarLogConfenciaComissaoController.java @@ -4,7 +4,8 @@ import java.util.ArrayList; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ public class EditarLogConfenciaComissaoController extends MyGenericForwardCompos private static final long serialVersionUID = 1L; - private static final Logger log = Logger.getLogger(EditarLogConfenciaComissaoController.class); + private static Logger log = LogManager.getLogger(EditarLogConfenciaComissaoController.class); @Autowired private ConferenciaComissaoService conferenciaComissaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/RecebimentoMaloteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/RecebimentoMaloteController.java index bcc8d4ffe..fcd012876 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/RecebimentoMaloteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/comissao/RecebimentoMaloteController.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.comissao; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Controller("recebimentoMaloteController") public class RecebimentoMaloteController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(RecebimentoMaloteController.class); + private static Logger log = LogManager.getLogger(RecebimentoMaloteController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/ConfigLayoulGeradorContratoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/ConfigLayoulGeradorContratoController.java index d7f78ed0f..af5677cb4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/ConfigLayoulGeradorContratoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/ConfigLayoulGeradorContratoController.java @@ -16,7 +16,8 @@ import java.net.MalformedURLException; import javax.activation.MimetypesFileTypeMap; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -53,7 +54,7 @@ public class ConfigLayoulGeradorContratoController extends MyGenericForwardCompo private ConfContratoPuntoVentaService confContratoPuntoVentaService; private ConfContratoPuntoVenta confContratoPuntoVenta; - private static Logger log = Logger.getLogger(ConfigLayoulGeradorContratoController.class); + private static Logger log = LogManager.getLogger(ConfigLayoulGeradorContratoController.class); private Radiogroup rdbGroup; public void onClick$btnExecutarRelatorio(Event ev) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarAlertaCtrlController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarAlertaCtrlController.java index b20079fd0..e3f882556 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarAlertaCtrlController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarAlertaCtrlController.java @@ -25,7 +25,8 @@ import java.util.ArrayList; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -103,7 +104,7 @@ public class EditarAlertaCtrlController extends MyGenericForwardComposer private Checkbox rdVie; private Checkbox rdSab; private Checkbox rdDom; - private static Logger log = Logger.getLogger(EditarAlertaCtrlController.class); + private static Logger log = LogManager.getLogger(EditarAlertaCtrlController.class); public AlertaCtrl getAlertaCtrl() { return alertaCtrl; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarComisionistaExternoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarComisionistaExternoController.java index 5372f5d77..5769c40ac 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarComisionistaExternoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarComisionistaExternoController.java @@ -11,7 +11,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ public class EditarComisionistaExternoController extends MyGenericForwardCompose private MyListbox comisionistaExternoList; private Textbox txtNome; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarComisionistaExternoController.class); + private static Logger log = LogManager.getLogger(EditarComisionistaExternoController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfigFeriadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfigFeriadoController.java index 1d6279487..9d0c37174 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfigFeriadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfigFeriadoController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccome 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -29,7 +30,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; public class EditarConfigFeriadoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarConfigFeriadoController.class); + private static Logger log = LogManager.getLogger(EditarConfigFeriadoController.class); @Autowired private FeriadoService feriadoService; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCancelacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCancelacionController.java index 15429108d..1b7aaddd5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCancelacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCancelacionController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -66,7 +67,7 @@ public class EditarConfiguracionCancelacionController extends MyGenericForwardCo @Autowired private OrgaoConcedenteService orgaoConcedenteService; private CancelacionCtrl cancelacionCtrl; - private static Logger log = Logger.getLogger(EditarConfiguracionCancelacionController.class); + private static Logger log = LogManager.getLogger(EditarConfiguracionCancelacionController.class); private List lsPuntoVenta; private List lsMarca; private List lsCancelacionCargo; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaController.java index 0ddbb9dbf..7220c3f68 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaController.java @@ -15,7 +15,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -107,7 +108,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionCa public class EditarConfiguracionCategoriaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarConfiguracionCategoriaController.class); + private static Logger log = LogManager.getLogger(EditarConfiguracionCategoriaController.class); @Autowired private MarcaService marcaService; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaPeriodoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaPeriodoController.java index f3856547d..45abf18de 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaPeriodoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionCategoriaPeriodoController.java @@ -15,7 +15,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionCa 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ public class EditarConfiguracionCategoriaPeriodoController extends MyGenericForw private List lsCategoriaPeriodo; private Datebox fecInicio; private Datebox fecFinal; - private static Logger log = Logger.getLogger(EditarConfiguracionCategoriaPeriodoController.class); + private static Logger log = LogManager.getLogger(EditarConfiguracionCategoriaPeriodoController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionFormaPagoController.java index bd15c8bec..0ef6f37b8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionFormaPagoController.java @@ -17,7 +17,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -54,7 +55,7 @@ public class EditarConfiguracionFormaPagoController extends MyGenericForwardComp private Combobox cmbPuntoVenta; private Combobox cmbRestriccionFormaPago; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarConfiguracionFormaPagoController.class); + private static Logger log = LogManager.getLogger(EditarConfiguracionFormaPagoController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionGeneralController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionGeneralController.java index 1c5faac5f..da64c392c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionGeneralController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionGeneralController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccome 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarConfiguracionGeneralController extends MyGenericForwardCompos private ConstanteService constanteService; private Constante constante; private MyListbox constanteList; - private static Logger log = Logger.getLogger(EditarConfiguracionGeneralController.class); + private static Logger log = LogManager.getLogger(EditarConfiguracionGeneralController.class); private MyTextboxCustom txtNome; private MyTextboxCustom descconstante; private MyTextboxCustom valorconstante; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionPacoteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionPacoteController.java index 665d0fc45..d00a7e0a8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionPacoteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionPacoteController.java @@ -5,7 +5,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -56,7 +57,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTarifaPacote; public class EditarConfiguracionPacoteController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarConfiguracionPacoteController.class); + private static Logger log = LogManager.getLogger(EditarConfiguracionPacoteController.class); @Autowired private RutaService rutaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java index 15cba3aaa..7012c3961 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConfiguracionReservacionController.java @@ -10,7 +10,8 @@ import java.util.Date; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -80,7 +81,7 @@ public class EditarConfiguracionReservacionController extends MyGenericForwardCo @Autowired private ParadaService paradaService; private ReservacionCtrl reservacionCtrl; - private static Logger log = Logger.getLogger(EditarConfiguracionReservacionController.class); + private static Logger log = LogManager.getLogger(EditarConfiguracionReservacionController.class); private Datebox fecInicio; private Datebox fecFinal; private Textbox txtDescripcion; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java index 68d1bfdeb..98592a2da 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java @@ -11,7 +11,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -128,7 +129,7 @@ public class EditarConvenioController extends MyGenericForwardComposer { private Radio rdNaoInformar; private Checkbox chkValidaFolio; - private static Logger log = Logger.getLogger(EditarConvenioController.class); + private static Logger log = LogManager.getLogger(EditarConvenioController.class); //Tramo private List lsConvenioTramo; private MyListbox convenioTramoList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarExcepcionPeajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarExcepcionPeajeController.java index d407101d3..2c69ff51d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarExcepcionPeajeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarExcepcionPeajeController.java @@ -6,7 +6,8 @@ import java.util.Calendar; import java.util.Collections; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -58,7 +59,7 @@ public class EditarExcepcionPeajeController extends MyGenericForwardComposer { private RutaService rutaService; @Autowired private ExcepcionPeajeService excepcionPeajeService; - private static Logger log = Logger.getLogger(EditarExcepcionPeajeController.class); + private static Logger log = LogManager.getLogger(EditarExcepcionPeajeController.class); private MyListbox excepcionPeajeVigenciaList; private List lsExcepcionPeajeVigencia; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java index bad0266d4..82bddab82 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamgeralController.java @@ -6,7 +6,8 @@ import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -71,7 +72,7 @@ public class EditarFechamentoParamgeralController extends MyGenericForwardCompos private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarFechamentoParamgeralController.class); + private static Logger log = LogManager.getLogger(EditarFechamentoParamgeralController.class); @Autowired private FechamentoParamgeralService fechamentoParamgeralService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamptovtaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamptovtaController.java index d2db38a5d..94a64fe7e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamptovtaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarFechamentoParamptovtaController.java @@ -5,7 +5,8 @@ import java.util.Calendar; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -31,7 +32,7 @@ public class EditarFechamentoParamptovtaController extends MyGenericForwardCompo private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarFechamentoParamptovtaController.class); + private static Logger log = LogManager.getLogger(EditarFechamentoParamptovtaController.class); @Autowired private FechamentoParamptovtaService fechamentoParamptovtaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarItemAdicionalController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarItemAdicionalController.java index 00bddd1fb..1b380af90 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarItemAdicionalController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarItemAdicionalController.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; public class EditarItemAdicionalController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarItemAdicionalController.class); + private static Logger log = LogManager.getLogger(EditarItemAdicionalController.class); @Autowired private ItemAdicionalService itemAdicionalService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelVendaPacoteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelVendaPacoteController.java index 678844c97..08deec51e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelVendaPacoteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelVendaPacoteController.java @@ -8,7 +8,8 @@ import java.math.BigDecimal; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ public class EditarMotivoCancelVendaPacoteController extends MyGenericForwardCom private MotivoCancelVendaPacoteService motivoCancelVendaPacoteService; private MotivoCancelVendaPacote motivoCancelVendaPacote; private MyListbox motivoCancelVendaPacoteList; - private static Logger log = Logger.getLogger(EditarMotivoCancelVendaPacoteController.class); + private static Logger log = LogManager.getLogger(EditarMotivoCancelVendaPacoteController.class); private Textbox txtNome; private Button btnApagar; private Combobox cmbTipoMotivo; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelacionController.java index 5a5c18eff..63128b43d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoCancelacionController.java @@ -8,7 +8,8 @@ import java.util.Calendar; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ public class EditarMotivoCancelacionController extends MyGenericForwardComposer private MotivoCancelacionService motivoCancelacionService; private MotivoCancelacion motivoCancelacion; private MyListbox motivoCancelacionList; - private static Logger log = Logger.getLogger(EditarMotivoCancelacionController.class); + private static Logger log = LogManager.getLogger(EditarMotivoCancelacionController.class); private Textbox txtNome; private Button btnApagar; private Combobox cmbTipoMotivo; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoDevolucaoBilheteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoDevolucaoBilheteController.java index 32142c468..234f09b68 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoDevolucaoBilheteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoDevolucaoBilheteController.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccome import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ public class EditarMotivoDevolucaoBilheteController extends MyGenericForwardComp private MotivoDevolucaoBilheteService motivoDevolucaoBilheteService; private MotivoDevolucaoBilhete motivoDevolucaoBilhete; private MyListbox motivoDevolucaoBilheteList; - private static Logger log = Logger.getLogger(EditarMotivoDevolucaoBilheteController.class); + private static Logger log = LogManager.getLogger(EditarMotivoDevolucaoBilheteController.class); private Textbox txtNome; private Button btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoReimpresionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoReimpresionController.java index d098b855a..7ddf330b5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoReimpresionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarMotivoReimpresionController.java @@ -10,7 +10,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarMotivoReimpresionController extends MyGenericForwardComposer private MotivoReimpresionService motivoReimpresionService; private MotivoReimpresion motivoReimpresion; private MyListbox motivoReimpresionList; - private static Logger log = Logger.getLogger(EditarMotivoReimpresionController.class); + private static Logger log = LogManager.getLogger(EditarMotivoReimpresionController.class); private Textbox txtNome; private Button btnApagar; private Button btnSalvar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPacoteTarifaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPacoteTarifaController.java index 9ae98280a..5217264a3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPacoteTarifaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPacoteTarifaController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccome 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -33,7 +34,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; public class EditarPacoteTarifaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPacoteTarifaController.class); + private static Logger log = LogManager.getLogger(EditarPacoteTarifaController.class); @Autowired private PacoteTarifaService pacoteTarifaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPeriodoVacacionalController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPeriodoVacacionalController.java index fc533add7..55a043309 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPeriodoVacacionalController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarPeriodoVacacionalController.java @@ -9,7 +9,8 @@ import com.rjconsultores.ventaboletos.service.PeriodoVacacionalService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarPeriodoVacacionalController extends MyGenericForwardComposer private PeriodoVacacionalService periodoVacacionalService; private PeriodoVacacional periodoVacacional; private MyListbox periodoVacacionalList; - private static Logger log = Logger.getLogger(EditarPeriodoVacacionalController.class); + private static Logger log = LogManager.getLogger(EditarPeriodoVacacionalController.class); private Datebox fecInicio; private Datebox fecFinal; private Button btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarRestriccionFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarRestriccionFormaPagoController.java index d9fee6eb6..0b449770a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarRestriccionFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarRestriccionFormaPagoController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -54,7 +55,7 @@ public class EditarRestriccionFormaPagoController extends MyGenericForwardCompos private Combobox cmbRestriccionFormaPago; private Combobox cmbEmpresa; private List lsEmpresas; - private static Logger log = Logger.getLogger(EditarRestriccionFormaPagoController.class); + private static Logger log = LogManager.getLogger(EditarRestriccionFormaPagoController.class); @Autowired EmpresaService empresaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java index 7b8b3e57d..c4002b267 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarSecretariaController.java @@ -12,7 +12,8 @@ import java.util.Comparator; 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.brazilutils.br.cpfcnpj.Cnpj; import org.brazilutils.validation.ValidationException; import org.springframework.beans.factory.annotation.Autowired; @@ -108,7 +109,7 @@ public class EditarSecretariaController extends MyGenericForwardComposer { @Autowired private ConstanteService constanteService; - private static Logger log = Logger.getLogger(EditarSecretariaController.class); + private static Logger log = LogManager.getLogger(EditarSecretariaController.class); private Row rowComboFormaPago; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTarjetaCreditoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTarjetaCreditoController.java index cb9d2abfe..c3737ce74 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTarjetaCreditoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTarjetaCreditoController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccome 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; public class EditarTarjetaCreditoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarTarjetaCreditoController.class); + private static Logger log = LogManager.getLogger(EditarTarjetaCreditoController.class); @Autowired private TarjetaCreditoService tarjetaCreditoService; private MyListbox tarjetaCreditoList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoCambioCiudadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoCambioCiudadController.java index 0dd7e3a90..d2f6e09d3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoCambioCiudadController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoCambioCiudadController.java @@ -19,7 +19,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -60,7 +61,7 @@ public class EditarTipoCambioCiudadController extends MyGenericForwardComposer { private Combobox cmbMonedaOrigen; private Combobox cmbMonedaDestino; private MyTextboxDecimal decImportecambio; - private static Logger log = Logger.getLogger(EditarTipoCambioCiudadController.class); + private static Logger log = LogManager.getLogger(EditarTipoCambioCiudadController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoTarifaPacoteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoTarifaPacoteController.java index 6ce7f6fcd..664a0d91a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoTarifaPacoteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTipoTarifaPacoteController.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; public class EditarTipoTarifaPacoteController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarTipoTarifaPacoteController.class); + private static Logger log = LogManager.getLogger(EditarTipoTarifaPacoteController.class); @Autowired private TipoTarifaPacoteService tipoTarifaPacoteService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdClaseServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdClaseServicioController.java index 764ad064a..57d16f743 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdClaseServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdClaseServicioController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarProdClaseServicioController extends MyGenericForwardComposer private Combobox cmbClaseServicio; private ProdClaseServicio prodClaseServicio; private List lsProdClaseServicio; - private static Logger log = Logger.getLogger(EditarProdClaseServicioController.class); + private static Logger log = LogManager.getLogger(EditarProdClaseServicioController.class); public List getLsClaseServicio() { return lsClaseServicio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdFormaPagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdFormaPagoController.java index e0c0d91ca..a0450218e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdFormaPagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdFormaPagoController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarProdFormaPagoController extends MyGenericForwardComposer { private Combobox cmbProdFormaPago; private ProdFormaPago prodFormaPago; private List lsProdFormaPago; - private static Logger log = Logger.getLogger(EditarProdFormaPagoController.class); + private static Logger log = LogManager.getLogger(EditarProdFormaPagoController.class); public List getLsFormaPago() { return lsFormaPago; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMarcaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMarcaController.java index 421307bee..914f8444e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMarcaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMarcaController.java @@ -10,7 +10,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -59,7 +60,7 @@ public class EditarProdMarcaController extends MyGenericForwardComposer { private MyTextboxDecimal txtImporteInicial; private MyTextboxDecimal txtImporteFinal; private MyTextboxDecimal tarifa; - private static Logger log = Logger.getLogger(EditarProdMarcaController.class); + private static Logger log = LogManager.getLogger(EditarProdMarcaController.class); public List getLsMarca() { return lsMarca; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMercadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMercadoController.java index 3e645d718..857a751ff 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMercadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdMercadoController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ public class EditarProdMercadoController extends MyGenericForwardComposer { private Combobox cmbDestino; private List lsProdMercado; private ProdMercado prodMercado; - private static Logger log = Logger.getLogger(EditarProdMercadoController.class); + private static Logger log = LogManager.getLogger(EditarProdMercadoController.class); public ProdMercado getProdMercado() { return prodMercado; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdPuntoVentaController.java index 11a1e2b04..0da8d97df 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdPuntoVentaController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarProdPuntoVentaController extends MyGenericForwardComposer { private MyComboboxPuntoVenta cmbPuntoVenta; private ProdPuntoVenta prodPuntoVenta; private List lsProdPuntoVenta; - private static Logger log = Logger.getLogger(EditarProdPuntoVentaController.class); + private static Logger log = LogManager.getLogger(EditarProdPuntoVentaController.class); public List getLsPuntoVentas() { return lsPuntoVentas; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdRutaController.java index 8d459dadc..31d6182b7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdRutaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarProdRutaController extends MyGenericForwardComposer { private Combobox cmbRuta; private List lsProdRuta; private ProdRuta prodRuta; - private static Logger log = Logger.getLogger(EditarProdPuntoVentaController.class); + private static Logger log = LogManager.getLogger(EditarProdPuntoVentaController.class); public List getLsRutas() { return lsRutas; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdTipoptovtaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdTipoptovtaController.java index 80e50406d..ff99ede2c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdTipoptovtaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdTipoptovtaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarProdTipoptovtaController extends MyGenericForwardComposer { private Combobox cmbTipoPuntoVenta; private ProdTipoptovta prodTipoPuntoVenta; private List lsProdTipoptovta; - private static Logger log = Logger.getLogger(EditarProdTipoptovtaController.class); + private static Logger log = LogManager.getLogger(EditarProdTipoptovtaController.class); public List getLsTipoPuntoVentas() { return lsTipoPuntoVentas; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdVigenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdVigenciaController.java index 00d072cf5..a4b7bc802 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdVigenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProdVigenciaController.java @@ -10,7 +10,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ public class EditarProdVigenciaController extends MyGenericForwardComposer { private Datebox fecInicio; private List lsProdVigencia; private Datebox fecFinal; - private static Logger log = Logger.getLogger(EditarProdTipoptovtaController.class); + private static Logger log = LogManager.getLogger(EditarProdTipoptovtaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProductoServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProductoServicioController.java index 06f2db8da..5ffbf47e5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProductoServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/cyberviaje/EditarProductoServicioController.java @@ -32,7 +32,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCyberViajeProdV import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -84,7 +85,7 @@ public class EditarProductoServicioController extends MyGenericForwardComposer { private List lsProdTipoptovta; private List lsProdVigencia; private List lsMarca; - private static Logger log = Logger.getLogger(EditarProductoServicioController.class); + private static Logger log = LogManager.getLogger(EditarProductoServicioController.class); private boolean salvo = false; private Button btnApagar; private Radio rdTipoPro; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarAltaCortesiaRHController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarAltaCortesiaRHController.java index af60f1ca8..928928ade 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarAltaCortesiaRHController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarAltaCortesiaRHController.java @@ -30,7 +30,8 @@ import java.text.MessageFormat; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -120,7 +121,7 @@ public class EditarAltaCortesiaRHController extends MyGenericForwardComposer { private Button btnSalvarBeneficiario; private Button btnPesquisa; private Button btnApagarBeneficiario; - private static Logger log = Logger.getLogger(EditarAltaCortesiaRHController.class); + private static Logger log = LogManager.getLogger(EditarAltaCortesiaRHController.class); private Button btnApagar; private Tab tabViaje; private Tab tabBeneficiarios; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarCortesiaTipoDireccionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarCortesiaTipoDireccionController.java index 018f9180c..716e22fcd 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarCortesiaTipoDireccionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarCortesiaTipoDireccionController.java @@ -18,7 +18,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.Calendar; import java.util.GregorianCalendar; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -60,7 +61,7 @@ public class EditarCortesiaTipoDireccionController extends MyGenericForwardCompo private Combobox cmbMarca; private Combobox cmbClaseSer; private Combobox cmbDesc; - private static Logger log = Logger.getLogger(EditarCortesiaTipoDireccionController.class); + private static Logger log = LogManager.getLogger(EditarCortesiaTipoDireccionController.class); private Button btnApagar; @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarGrupoCortesiasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarGrupoCortesiasController.java index 28cf85114..0a4943a21 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarGrupoCortesiasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarGrupoCortesiasController.java @@ -10,7 +10,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -35,7 +36,7 @@ public class EditarGrupoCortesiasController extends MyGenericForwardComposer { private GrupoCortesia grupoCortesia; private MyListbox grupoCortesiasList; private Textbox txtNome; - private static Logger log = Logger.getLogger(EditarGrupoCortesiasController.class); + private static Logger log = LogManager.getLogger(EditarGrupoCortesiasController.class); private Button btnApagar; private Button btnSalvar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaController.java index 4d4cf0190..4fb53e2f4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ public class EditarTipoCortesiaController extends MyGenericForwardComposer { private Textbox txtNome; private List grupoCortesiaList; private Combobox cmbGrupoCortesia; - private static Logger log = Logger.getLogger(EditarTipoCortesiaDController.class); + private static Logger log = LogManager.getLogger(EditarTipoCortesiaDController.class); private Button btnApagar; private Button btnSalvar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaDController.java index fb4823f4b..e265151c5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaDController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/cortesias/EditarTipoCortesiaDController.java @@ -16,7 +16,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; import java.math.BigDecimal; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -49,7 +50,7 @@ public class EditarTipoCortesiaDController extends MyGenericForwardComposer { private Button btnApagar; private Combobox cmbTipoCortesiaD; private ConstraintPorcentagem ct; - private static Logger log = Logger.getLogger(EditarTipoCortesiaDController.class); + private static Logger log = LogManager.getLogger(EditarTipoCortesiaDController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarClaseservicioEquivalenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarClaseservicioEquivalenciaController.java index d2fe08d12..804a7bab1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarClaseservicioEquivalenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarClaseservicioEquivalenciaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ public class EditarClaseservicioEquivalenciaController extends MyGenericForwardC private ClaseServicioService claseServicioService; private ClaseservicioEquivalencia claseServicioEquivalencia; private MyListbox claseServicioEquivalenciaList; - private static Logger log = Logger.getLogger(EditarClaseservicioEquivalenciaController.class); + private static Logger log = LogManager.getLogger(EditarClaseservicioEquivalenciaController.class); private List lsComisionistaExterno; private List lsClaseServicio; private Combobox cmbClaseServicio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarEmpresaEquivalenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarEmpresaEquivalenciaController.java index 73a03541d..23baa2bee 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarEmpresaEquivalenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarEmpresaEquivalenciaController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ public class EditarEmpresaEquivalenciaController extends MyGenericForwardCompose private EmpresaService empresaService; private EmpresaEquivalencia empresaEquivalencia; private MyListbox empresaEquivalenciaList; - private static Logger log = Logger.getLogger(EditarEmpresaEquivalenciaController.class); + private static Logger log = LogManager.getLogger(EditarEmpresaEquivalenciaController.class); private List lsComisionistaExterno; private List lsEmpresas; private Combobox cmbEmpresa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarMotivoCancelacionEquivalenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarMotivoCancelacionEquivalenciaController.java index dee4e766b..d863ea604 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarMotivoCancelacionEquivalenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarMotivoCancelacionEquivalenciaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.service.MotivocancelacionEquivalenciaServi import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarMotivoCancelacionEquivalenciaController extends MyGenericForw private MotivoCancelacionService motivoCancelacionService; private MotivocancelacionEquivalencia motivoCancelacionEquivalencia; private MyListbox motivoCancelacionEquivalenciaList; - private static Logger log = Logger.getLogger(EditarMotivoCancelacionEquivalenciaController.class); + private static Logger log = LogManager.getLogger(EditarMotivoCancelacionEquivalenciaController.class); private List lsComisionistaExterno; private List lsMotivoCancelacion; private Combobox cmbMotivoCancelacion; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarParadaEquivalenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarParadaEquivalenciaController.java index 5a13268b0..9c6733e51 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarParadaEquivalenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/equivalencia/EditarParadaEquivalenciaController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.service.ParadaEquivalenciaService; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ public class EditarParadaEquivalenciaController extends MyGenericForwardComposer private ComisionistaExternoService comisionistaExternoService; private ParadaEquivalencia paradaEquivalencia; private MyListbox paradaEquivalenciaList; - private static Logger log = Logger.getLogger(EditarParadaEquivalenciaController.class); + private static Logger log = LogManager.getLogger(EditarParadaEquivalenciaController.class); private List lsComisionistaExterno; private Combobox cmbParada; private Combobox cmbComissionestaExterno; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarAutobusController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarAutobusController.java index dc23ccb18..821d91362 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarAutobusController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarAutobusController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -93,7 +94,7 @@ public class EditarAutobusController extends MyGenericForwardComposer { private Combobox cmbCiudad; private Combobox cmbEmpresas; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarAutobusController.class); + private static Logger log = LogManager.getLogger(EditarAutobusController.class); public Autobus getAutobus() { return autobus; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeAgruparParadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeAgruparParadaController.java index 396c88af1..47648a58d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeAgruparParadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeAgruparParadaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; 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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarCatalogoDeAgruparParadaController extends MyGenericForwardCom private ParadaService paradaService; private AgrupamentoParada agrupamentoParada; private MyListbox agrupamentoParadaList; - private static Logger log = Logger.getLogger(EditarCatalogoDeAgruparParadaController.class); + private static Logger log = LogManager.getLogger(EditarCatalogoDeAgruparParadaController.class); private Textbox descAgrupamentoParada; private Textbox cveAgrupamentoParada; private MyListbox localidadesListbox; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java index dfe97c902..b9faeae4d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeParadaController.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -68,7 +69,7 @@ public class EditarCatalogoDeParadaController extends MyGenericForwardComposer { private AgruparParadaService agruparParadaService; private Parada parada; private MyListbox paradaList; - private static Logger log = Logger.getLogger(EditarCatalogoDeParadaController.class); + private static Logger log = LogManager.getLogger(EditarCatalogoDeParadaController.class); private Textbox txtNome; private Textbox cveparada; private MyComboboxCiudad cmbCiudad; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java index df2814425..44b283d40 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCatalogoDeRutaController.java @@ -23,7 +23,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -196,7 +197,7 @@ public class EditarCatalogoDeRutaController extends MyGenericForwardComposer private Integer ultimaSecuencia; private Boolean secuenciaFoiAlterada = Boolean.FALSE; private Boolean modificado = Boolean.FALSE; - private static Logger log = Logger.getLogger(EditarCatalogoDeRutaController.class); + private static Logger log = LogManager.getLogger(EditarCatalogoDeRutaController.class); private boolean carregouCombinacao; private MyTextbox txtNumRuta; private Intbox txtCantEixos; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionController.java index b17b32ba2..5e5a3592b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionController.java @@ -6,7 +6,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -51,7 +52,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEditarConexion; @Scope("prototype") public class EditarConexionController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarConexionController.class); + private static Logger log = LogManager.getLogger(EditarConexionController.class); @Autowired private ConexionExcepcionService conexionExcepcionService; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionExcepcionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionExcepcionController.java index e501022f5..2376ddf99 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionExcepcionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConexionExcepcionController.java @@ -4,7 +4,8 @@ import java.util.ArrayList; import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -29,7 +30,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCorridaConexion public class EditarConexionExcepcionController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarConexionExcepcionController.class); + private static Logger log = LogManager.getLogger(EditarConexionExcepcionController.class); @Autowired private ConexionExcepcionService conexionExcepcionService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java index 82bf69b82..633bbd443 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarConfRestricaoCanalVentaController.java @@ -5,7 +5,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -72,7 +73,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfRestricaoTr @Scope("prototype") public class EditarConfRestricaoCanalVentaController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarConfRestricaoCanalVentaController.class); + private static Logger log = LogManager.getLogger(EditarConfRestricaoCanalVentaController.class); private static final long serialVersionUID = 1L; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaAsientoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaAsientoController.java index 9aa981b1a..675279354 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaAsientoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaAsientoController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; 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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -222,7 +223,7 @@ public class EditarCorridaAsientoController extends MyGenericForwardComposer { private Radio poltronaOcupada; private MyComboboxEstandar cmbDestino; private Textbox txtMotivo; - private static Logger log = Logger.getLogger(EditarCorridaAsientoController.class); + private static Logger log = LogManager.getLogger(EditarCorridaAsientoController.class); private List layout; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java index 3fa6900c0..117a54e22 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarCorridaController.java @@ -19,7 +19,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.BooleanUtils; 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.context.annotation.Scope; import org.springframework.dao.DataIntegrityViolationException; @@ -111,7 +112,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEsquemaCorridaE public class EditarCorridaController extends MyGenericForwardComposer { private static final int PERIODO_MAXIMO_90_DIAS = 90; - private static Logger log = Logger.getLogger(EditarCorridaController.class); + private static Logger log = LogManager.getLogger(EditarCorridaController.class); private static final long serialVersionUID = 1L; //Services @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDataEdicaoCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDataEdicaoCorridaController.java index e9141ce49..aabca0575 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDataEdicaoCorridaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDataEdicaoCorridaController.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; import java.util.Date; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; @@ -31,7 +32,7 @@ public class EditarDataEdicaoCorridaController extends MyGenericForwardComposer private Button btnApagar; private Datebox fecInicio; private Datebox fecFinal; - private Logger log = Logger.getLogger(EditarDataEdicaoCorridaController.class); + private static final Logger log = LogManager.getLogger(EditarDataEdicaoCorridaController.class); public Button getBtnApagar() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDiagramaAutobusController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDiagramaAutobusController.java index 5aad863f0..7cc10f26e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDiagramaAutobusController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarDiagramaAutobusController.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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -240,7 +241,7 @@ public class EditarDiagramaAutobusController extends MyGenericForwardComposer { private Button btn_7_24; private Button btn_7_25; private Button btn_7_26; - private static Logger log = Logger.getLogger(EditarDiagramaAutobusController.class); + private static Logger log = LogManager.getLogger(EditarDiagramaAutobusController.class); private Checkbox chkUsaVagaoFim; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEmpresaTrocoSimplesController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEmpresaTrocoSimplesController.java index fcc4d84e2..29f7eaa39 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEmpresaTrocoSimplesController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEmpresaTrocoSimplesController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; import java.math.BigDecimal; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ public class EditarEmpresaTrocoSimplesController extends MyGenericForwardCompose private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarEmpresaTrocoSimplesController.class); + private static Logger log = LogManager.getLogger(EditarEmpresaTrocoSimplesController.class); @Autowired private EmpresaTrocoSimplesService trocoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEsquemaAgrupacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEsquemaAgrupacionController.java index e53bcffde..e2e376214 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEsquemaAgrupacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarEsquemaAgrupacionController.java @@ -13,7 +13,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.collections.CollectionUtils; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -74,7 +75,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionEs @Scope("prototype") public class EditarEsquemaAgrupacionController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarEsquemaAgrupacionController.class); + private static Logger log = LogManager.getLogger(EditarEsquemaAgrupacionController.class); private static final long serialVersionUID = 1L; private MyListbox esquemaCorridaList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarParamConexionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarParamConexionController.java index 47fbfe373..8f3962c24 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarParamConexionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarParamConexionController.java @@ -4,7 +4,8 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -33,7 +34,7 @@ public class EditarParamConexionController extends MyGenericForwardComposer { private ParamConexionService paramConexionService; private ParamConexion paramConexion; private MyListbox paramConexionList; - private static Logger log = Logger.getLogger(EditarParamConexionController.class); + private static Logger log = LogManager.getLogger(EditarParamConexionController.class); private Textbox txtNome; private Textbox descconstante; private Textbox valorconstante; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarRolOperativoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarRolOperativoController.java index edb63964c..1e3e6a4fc 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarRolOperativoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarRolOperativoController.java @@ -9,7 +9,8 @@ import java.util.Date; import java.util.GregorianCalendar; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -50,7 +51,7 @@ public class EditarRolOperativoController extends MyGenericForwardComposer { private Timebox timeprevio; private Textbox txtDesRol; private Combobox cmbDiagramaBus; - private static Logger log = Logger.getLogger(EditarRolOperativoController.class); + private static Logger log = LogManager.getLogger(EditarRolOperativoController.class); public Combobox getCmbDiagramaBus() { return cmbDiagramaBus; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarSecuenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarSecuenciaController.java index 00254969a..7ac3a4697 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarSecuenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarSecuenciaController.java @@ -4,7 +4,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -58,7 +59,7 @@ public class EditarSecuenciaController extends MyGenericForwardComposer{ private List lsParadasSequencia; private MyListbox rutaSecuenciaList; - private static Logger log = Logger.getLogger(EditarSecuenciaController.class); + private static Logger log = LogManager.getLogger(EditarSecuenciaController.class); @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTipoParadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTipoParadaController.java index 1cde5eeeb..64dd7ad81 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTipoParadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTipoParadaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ public class EditarTipoParadaController extends MyGenericForwardComposer { private TipoParada tipoParada; private MyListbox tipoParadaList; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarTipoParadaController.class); + private static Logger log = LogManager.getLogger(EditarTipoParadaController.class); private Textbox txtNome; private Row rowEquivalencia; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramoKmServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramoKmServicioController.java index 62dfd5598..d3f89ece4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramoKmServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramoKmServicioController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -58,7 +59,7 @@ public class EditarTramoKmServicioController extends MyGenericForwardComposer { private TramoKmServicio tramoKmServicio; private MyListbox tramoKmServicioList; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarTramoKmServicioController.class); + private static Logger log = LogManager.getLogger(EditarTramoKmServicioController.class); private Combobox cmbTramo; private Combobox cmbEmpresa; private Combobox cmbClaseServicio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java index 7009ca177..14662adab 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarTramosController.java @@ -12,7 +12,8 @@ import java.util.List; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -79,7 +80,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTramoTiempo; @Scope("prototype") public class EditarTramosController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarTramosController.class); + private static Logger log = LogManager.getLogger(EditarTramosController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarViaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarViaController.java index 19cc915ec..69579b4d5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarViaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EditarViaController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -39,7 +40,7 @@ public class EditarViaController extends MyGenericForwardComposer { private MyListbox viaList; private Textbox txtNome; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarViaController.class); + private static Logger log = LogManager.getLogger(EditarViaController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EstoqueTaxaEmbarqueW2iController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EstoqueTaxaEmbarqueW2iController.java index 24e629cea..0565408b9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EstoqueTaxaEmbarqueW2iController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/EstoqueTaxaEmbarqueW2iController.java @@ -6,7 +6,8 @@ import java.util.List; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEstoqueTaxaDeEm public class EstoqueTaxaEmbarqueW2iController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EstoqueTaxaEmbarqueW2iController.class); + private static Logger log = LogManager.getLogger(EstoqueTaxaEmbarqueW2iController.class); @Autowired private OrgaoConcedenteService orgaoConcedenteService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java index a730edfcd..5e354ff69 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/GerarConexionPorRutaController.java @@ -8,7 +8,8 @@ import java.util.HashSet; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -71,7 +72,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderGeracaoConexion public class GerarConexionPorRutaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(GerarConexionPorRutaController.class); + private static Logger log = LogManager.getLogger(GerarConexionPorRutaController.class); @Autowired private ConexionRutaConfService conexionRutaConfService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/flexbus/EditarCorridaFlexBusController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/flexbus/EditarCorridaFlexBusController.java index 4acf0e813..e463744d9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/flexbus/EditarCorridaFlexBusController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/flexbus/EditarCorridaFlexBusController.java @@ -5,7 +5,8 @@ import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ public class EditarCorridaFlexBusController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarCorridaFlexBusController.class); + private static Logger log = LogManager.getLogger(EditarCorridaFlexBusController.class); @Autowired private BuqueCorridaFlexBusController busqueCorridaFlexBusController; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/BusquedaGP_PricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/BusquedaGP_PricingController.java index 86b61c611..8910de2f7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/BusquedaGP_PricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/BusquedaGP_PricingController.java @@ -6,7 +6,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -66,7 +67,7 @@ public class BusquedaGP_PricingController extends MyGenericForwardComposer { @Autowired private ParadaService paradaService; - private static Logger log = Logger.getLogger(BusquedaGP_PricingController.class); + private static Logger log = LogManager.getLogger(BusquedaGP_PricingController.class); public List getLsPricing() { return lsPricing; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingAsientoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingAsientoController.java index 85f075a83..c440d6fc3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingAsientoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingAsientoController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -35,7 +36,7 @@ public class EditarGP_PricingAsientoController extends MyGenericForwardComposer private MyTextboxDecimal porcentaje; private Intbox numeasiento; private ConstraintPorcentagem ct; - private static Logger log = Logger.getLogger(EditarGP_PricingAsientoController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingAsientoController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCategoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCategoriaController.java index 82afd1e97..0279af526 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCategoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCategoriaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarGP_PricingCategoriaController extends MyGenericForwardCompose private GP_PricingCategoria pricingCategoria; private MyListbox pricingCategoriaList; private Combobox cmbCategoria; - private static Logger log = Logger.getLogger(EditarGP_PricingCategoriaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingCategoriaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingClaseController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingClaseController.java index b8a4b6406..c5e20d7c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingClaseController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingClaseController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ public class EditarGP_PricingClaseController extends MyGenericForwardComposer { private GP_PricingClase pricingClase; private MyListbox pricingClaseList; private Combobox cmbClase; - private static Logger log = Logger.getLogger(EditarGP_PricingClaseController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingClaseController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingController.java index 2a26a72ce..84375eb0b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingController.java @@ -9,7 +9,8 @@ import java.util.Map; import java.util.logging.Level; import org.apache.commons.lang.BooleanUtils; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -120,7 +121,7 @@ import ch.stfo.zk.component.Colorbox; public class EditarGP_PricingController extends PricingController { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarGP_PricingController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingController.class); @Autowired private GP_PricingService pricingService; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCorridaController.java index 68bbb9388..2a277a0d8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCorridaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingCorridaController.java @@ -4,7 +4,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -56,7 +57,7 @@ public class EditarGP_PricingCorridaController extends MyGenericForwardComposer private Combobox cmbTipoServicio; private Timebox timeInicio; private Timebox timeFin; - private static Logger log = Logger.getLogger(EditarGP_PricingCorridaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingCorridaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingDiaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingDiaController.java index 0b57d9b2a..f476f53f9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingDiaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingDiaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarGP_PricingDiaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarGP_PricingDiaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingDiaController.class); @Autowired private GP_PricingDiaService pricingDiaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoController.java index 1a2823326..f48d4d128 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoController.java @@ -9,7 +9,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -70,7 +71,7 @@ import ch.stfo.zk.component.Colorbox; public class EditarGP_PricingEspecificoController extends PricingController { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarGP_PricingEspecificoController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingEspecificoController.class); @Autowired private GP_PricingEspecificoService pricingEspecificoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoOcupacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoOcupacionController.java index 676d3335b..49c6da3c7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoOcupacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingEspecificoOcupacionController.java @@ -6,7 +6,8 @@ import java.util.List; import java.util.Locale; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; public class EditarGP_PricingEspecificoOcupacionController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarGP_PricingEspecificoOcupacionController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingEspecificoOcupacionController.class); private GP_PricingEspecifico pricingEspecifico; private GP_PricingEspecificoOcupacion pricingEspecificoOcupacion; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingFormapagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingFormapagoController.java index aa837290b..986c113b0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingFormapagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingFormapagoController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -25,7 +26,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarGP_PricingFormapagoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarGP_PricingFormapagoController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingFormapagoController.class); @Autowired private FormaPagoService formaPagoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingImporteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingImporteController.java index 4f18e7be7..953a794ba 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingImporteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingImporteController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ public class EditarGP_PricingImporteController extends MyGenericForwardComposer private MyListbox pricingImporteList; private Combobox cmbMoneda; private MyTextboxDecimal importe; - private static Logger log = Logger.getLogger(EditarGP_PricingImporteController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingImporteController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMarcaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMarcaController.java index e56d84135..3b5618b5d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMarcaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMarcaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarGP_PricingMarcaController extends MyGenericForwardComposer { private GP_PricingMarca pricingMarca; private MyListbox pricingMarcaList; private Combobox cmbMarca; - private static Logger log = Logger.getLogger(EditarGP_PricingMarcaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingMarcaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMercadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMercadoController.java index dcbeeddfe..54d69ef3c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMercadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingMercadoController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarGP_PricingMercadoController extends MyGenericForwardComposer private MyListbox pricingMercadoList; private Combobox cmbOrigen; private Combobox cmbDestino; - private static Logger log = Logger.getLogger(EditarGP_PricingMercadoController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingMercadoController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaAutomaticoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaAutomaticoController.java index 93b67088e..8c93e2905 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaAutomaticoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaAutomaticoController.java @@ -7,7 +7,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -70,7 +71,7 @@ public class EditarGP_PricingOcupaAntecipaAutomaticoController extends MyGeneric private GP_Pricing pricing; private ConstraintPorcentagem ct; - private static Logger log = Logger.getLogger(EditarGP_PricingOcupaAntecipaAutomaticoController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingOcupaAntecipaAutomaticoController.class); private List columns; private List lsPricingOcupacaoAntecipaVO; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaController.java index 067d4e64c..b5978073e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingOcupaAntecipaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ import ch.stfo.zk.component.Colorbox; public class EditarGP_PricingOcupaAntecipaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarGP_PricingOcupaAntecipaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingOcupaAntecipaController.class); @Autowired private GP_PricingOcupaAntecipaService pricingOcupaAntecipaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingPuntoVentaController.java index 06dfb83f1..18f1abd77 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingPuntoVentaController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ public class EditarGP_PricingPuntoVentaController extends MyGenericForwardCompos private GP_PricingPuntoVenta pricingPuntoVenta; private MyListbox pricingPuntoVentaList; private Combobox cmbPuntoVenta; - private static Logger log = Logger.getLogger(EditarGP_PricingPuntoVentaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingPuntoVentaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingRutaController.java index da955d819..242b84490 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingRutaController.java @@ -4,7 +4,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ public class EditarGP_PricingRutaController extends MyGenericForwardComposer { private GP_PricingRuta pricingRuta; private MyListbox pricingRutaList; private Combobox cmbRuta; - private static Logger log = Logger.getLogger(EditarGP_PricingRutaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingRutaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoPtoVtaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoPtoVtaController.java index 5eea81328..822426b87 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoPtoVtaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoPtoVtaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarGP_PricingTipoPtoVtaController extends MyGenericForwardCompos private GP_PricingTipoPtoVta pricingTipoPtoVta; private MyListbox pricingTipoPtoVtaList; private Combobox cmbTipoPtoVta; - private static Logger log = Logger.getLogger(EditarGP_PricingTipoPtoVtaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingTipoPtoVtaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoServicioController.java index b237b0605..fa1f31a8f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingTipoServicioController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ public class EditarGP_PricingTipoServicioController extends MyGenericForwardComp private GP_PricingTipoServicio pricingTipoServicio; private MyListbox pricingTipoServicioList; private Combobox cmbTipoServicio; - private static Logger log = Logger.getLogger(EditarGP_PricingTipoServicioController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingTipoServicioController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingVigenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingVigenciaController.java index 336de6731..b363de005 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingVigenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/EditarGP_PricingVigenciaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.gestaopricing; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ public class EditarGP_PricingVigenciaController extends MyGenericForwardComposer private GP_PricingVigenciaService pricingVigenciaService; private GP_PricingVigencia pricingVigencia; private MyListbox pricingVigenciaList; - private static Logger log = Logger.getLogger(EditarGP_PricingVigenciaController.class); + private static Logger log = LogManager.getLogger(EditarGP_PricingVigenciaController.class); private Datebox fecinicioviaje; private Datebox fecfinviaje; private Datebox fecinicioventa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/GestaoPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/GestaoPricingController.java index 425e55c95..8a7ed926f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/GestaoPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gestaopricing/GestaoPricingController.java @@ -16,7 +16,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.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -103,7 +104,7 @@ public class GestaoPricingController extends MyGenericForwardComposer { private ClaseServicio classe; private Ruta ruta; - private static Logger log = Logger.getLogger(GestaoPricingController.class); + private static Logger log = LogManager.getLogger(GestaoPricingController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java index 1daa5c2f1..e1afc9596 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/gr/EditarAidfController.java @@ -7,7 +7,8 @@ import java.util.List; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -115,7 +116,7 @@ public class EditarAidfController extends MyGenericForwardComposer { private Combobox cmbTipoValidaVenta; private MyComboboxPuntoVenta cmbPuntoVenta; private Row rowPuntoVenta; - private static Logger log = Logger.getLogger(EditarAidfController.class); + private static Logger log = LogManager.getLogger(EditarAidfController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaExportacaoFiscalController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaExportacaoFiscalController.java index fdf53e9f4..7d6a22530 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaExportacaoFiscalController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaExportacaoFiscalController.java @@ -9,7 +9,8 @@ import java.util.List; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaExportacaoFiscalController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaExportacaoFiscalController.class); + private static Logger log = LogManager.getLogger(BusquedaExportacaoFiscalController.class); @Autowired private FiscalService fiscalService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java index 830a564e4..f0e2e63c6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImportacionFiscalController.java @@ -17,7 +17,8 @@ import java.util.Map; import javax.sql.DataSource; import org.apache.commons.io.IOUtils; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -58,7 +59,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaImportacionFiscalController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaImportacionFiscalController.class); + private static Logger log = LogManager.getLogger(BusquedaImportacionFiscalController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java index 8f12d56bb..073b35e26 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaImpressaoRMDController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -47,7 +48,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; public class BusquedaImpressaoRMDController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaImpressaoRMDController.class); + private static Logger log = LogManager.getLogger(BusquedaImpressaoRMDController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioFinanceiroController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioFinanceiroController.java index ebc966c96..ce258534b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioFinanceiroController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioFinanceiroController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -47,7 +48,7 @@ import com.trg.search.Filter; public class BusquedaRelatorioFinanceiroController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaRelatorioFinanceiroController.class); + private static Logger log = LogManager.getLogger(BusquedaRelatorioFinanceiroController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioRDIController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioRDIController.java index b1e1ca065..0860b04c4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioRDIController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/BusquedaRelatorioRDIController.java @@ -7,7 +7,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEstadoUf; public class BusquedaRelatorioRDIController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaRelatorioRDIController.class); + private static Logger log = LogManager.getLogger(BusquedaRelatorioRDIController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarAliquotaECFController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarAliquotaECFController.java index f19c64836..4fdcf4d8b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarAliquotaECFController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarAliquotaECFController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.impressaofiscal; import java.math.BigDecimal; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ public class EditarAliquotaECFController extends MyGenericForwardComposer { private MyTextboxDecimal txtIcms; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarAliquotaECFController.class); + private static Logger log = LogManager.getLogger(EditarAliquotaECFController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarFormapagoEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarFormapagoEmpresaController.java index f505083a6..c2b845c21 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarFormapagoEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarFormapagoEmpresaController.java @@ -4,7 +4,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -62,7 +63,7 @@ public class EditarFormapagoEmpresaController extends MyGenericForwardComposer private Button btnApagar; private Radio radVinculado; - private static Logger log = Logger.getLogger(EditarFormapagoEmpresaController.class); + private static Logger log = LogManager.getLogger(EditarFormapagoEmpresaController.class); @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarRelgerencialEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarRelgerencialEmpresaController.java index f3a96cecb..df02eb48e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarRelgerencialEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarRelgerencialEmpresaController.java @@ -4,7 +4,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -54,7 +55,7 @@ public class EditarRelgerencialEmpresaController extends MyGenericForwardCompose private Button btnApagar; - private static Logger log = Logger.getLogger(EditarRelgerencialEmpresaController.class); + private static Logger log = LogManager.getLogger(EditarRelgerencialEmpresaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarTotnaofiscalEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarTotnaofiscalEmpresaController.java index 20f40aeea..a5a9293c7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarTotnaofiscalEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/impressaofiscal/EditarTotnaofiscalEmpresaController.java @@ -5,7 +5,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -65,7 +66,7 @@ public class EditarTotnaofiscalEmpresaController extends MyGenericForwardCompose private Button btnApagar; - private static Logger log = Logger.getLogger(EditarTotnaofiscalEmpresaController.class); + private static Logger log = LogManager.getLogger(EditarTotnaofiscalEmpresaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarBancoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarBancoController.java index ec6b7e1d4..2f2d41b5d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarBancoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarBancoController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -58,7 +59,7 @@ public class EditarBancoController extends MyGenericForwardComposer { private List lsPuntoVenta; private Banco banco; private MyListbox bancoList; - private static Logger log = Logger.getLogger(EditarBancoController.class); + private static Logger log = LogManager.getLogger(EditarBancoController.class); private MyTextbox txtNome; private Button btnApagar; private MyTextbox refContrato; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java index 0061aacfb..eac38dd62 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java @@ -9,7 +9,8 @@ import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -82,7 +83,7 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer { private MyComboboxEstandar cmbCveTipoEvento; private Row rowIndEnviaExcessoDeBagagemSefaz; - private static Logger log = Logger.getLogger(EditarTipoEventoExtraController.class); + private static Logger log = LogManager.getLogger(EditarTipoEventoExtraController.class); public TipoEventoExtra getTipoEventoExtra() { return tipoEventoExtra; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionConferenciaMovimentoJob.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionConferenciaMovimentoJob.java index 2f64d930c..b32834f4d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionConferenciaMovimentoJob.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionConferenciaMovimentoJob.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.job; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -15,7 +16,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; * */ public class GeneracionConferenciaMovimentoJob implements Job { - private static Logger log = Logger.getLogger(GeneracionConferenciaMovimentoJob.class); + private static Logger log = LogManager.getLogger(GeneracionConferenciaMovimentoJob.class); private CorridaService corridaService; private ConferenciaComissaoService conferenciaComissaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionCorridaJob.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionCorridaJob.java index aac6abc2a..bc8c230b4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionCorridaJob.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionCorridaJob.java @@ -4,7 +4,8 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.job; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -19,17 +20,17 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; */ public class GeneracionCorridaJob implements Job { - private static Logger log = Logger.getLogger(GeneracionCorridaJob.class); + private static Logger log = LogManager.getLogger(GeneracionCorridaJob.class); @Override public void execute(JobExecutionContext jec) throws JobExecutionException { - log.info("Inicio do job de geração de corridas."); + log.info("Inicio do job de gera��o de corridas."); ApplicationContext appContext = AppContext.getApplicationContext(); CorridaService cs = (CorridaService) appContext.getBean("corridaService"); cs.generarCorridaAutomatica(); - log.info("Fim do job de geração de corridas."); + log.info("Fim do job de gera��o de corridas."); } } diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionRetencaoDiariaComissaoJob.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionRetencaoDiariaComissaoJob.java index 794b64eba..ca35e5f24 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionRetencaoDiariaComissaoJob.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/GeneracionRetencaoDiariaComissaoJob.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.job; 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.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -19,7 +20,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class GeneracionRetencaoDiariaComissaoJob implements Job { - private static Logger log = Logger.getLogger(GeneracionRetencaoDiariaComissaoJob.class); + private static Logger log = LogManager.getLogger(GeneracionRetencaoDiariaComissaoJob.class); @@ -46,7 +47,7 @@ public class GeneracionRetencaoDiariaComissaoJob implements Job { log.info("Verificando fechamento dos caixas, data: " + DateUtil.getStringDate(feccorte, "dd/MM/yyyy")); if(!ctrlFechamentoCaixaService.autorizarExecutarRotinaRetencao(feccorte)) { - log.info("Fechamento dos caixas não disponiveis para retencao da comissao"); + log.info("Fechamento dos caixas n�o disponiveis para retencao da comissao"); return; } log.info("fechamento dos caixas concluido, executar rotina de retencao da comissao"); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/IntegracaoSapJob.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/IntegracaoSapJob.java index 92b86cbf2..bd1c5049d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/IntegracaoSapJob.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/IntegracaoSapJob.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.job; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -11,7 +12,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class IntegracaoSapJob implements Job { - private static Logger log = Logger.getLogger(IntegracaoSapJob.class); + private static Logger log = LogManager.getLogger(IntegracaoSapJob.class); private SapService sapService; public SapService getSapService() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/MonitoramentoCCFCRZJob.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/MonitoramentoCCFCRZJob.java index 7552e270d..61e343aad 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/MonitoramentoCCFCRZJob.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/job/MonitoramentoCCFCRZJob.java @@ -8,7 +8,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.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.service.MonitoramentoCRZService; import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class MonitoramentoCCFCRZJob implements Job { - private static Logger log = Logger.getLogger(MonitoramentoCCFCRZJob.class); + private static Logger log = LogManager.getLogger(MonitoramentoCCFCRZJob.class); private Calendar inicio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java index d67662a9e..1b46ee583 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/BusquedaManutencaoPacoteController.java @@ -31,7 +31,7 @@ public class BusquedaManutencaoPacoteController extends MyGenericForwardComposer private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaManutencaoPacoteController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaManutencaoPacoteController.class); @Autowired private transient PagedListWrapper plwEnderecoApanhe; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/EditarManutencaoPacoteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/EditarManutencaoPacoteController.java index ca68c742e..9aecee890 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/EditarManutencaoPacoteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pacote/EditarManutencaoPacoteController.java @@ -5,7 +5,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ import net.sf.jasperreports.engine.util.JRLoader; @Scope("prototype") public class EditarManutencaoPacoteController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarManutencaoPacoteController.class); + private static Logger log = LogManager.getLogger(EditarManutencaoPacoteController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/ActualizaTarjetaViajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/ActualizaTarjetaViajeController.java index 21b3a74ce..28d1dba2f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/ActualizaTarjetaViajeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/ActualizaTarjetaViajeController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pagoconductor; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -26,7 +27,7 @@ public class ActualizaTarjetaViajeController extends MyGenericForwardComposer { private CorridaTramoService corridaTramoService; @Autowired private TarjetaViajeService tarjetaViajeService; - private static Logger log = Logger.getLogger(ActualizaTarjetaViajeController.class); + private static Logger log = LogManager.getLogger(ActualizaTarjetaViajeController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/EditarTarjetaViajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/EditarTarjetaViajeController.java index b10c569fd..24b65f650 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/EditarTarjetaViajeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pagoconductor/EditarTarjetaViajeController.java @@ -7,7 +7,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -49,7 +50,7 @@ public class EditarTarjetaViajeController extends MyGenericForwardComposer { private MyListbox tarjetaViajeList; @Autowired private TarjetaViajeService tarjetaViajeService; - private static Logger log = Logger.getLogger(EditarTarjetaViajeController.class); + private static Logger log = LogManager.getLogger(EditarTarjetaViajeController.class); private List lsEmpresa; private List lsAutobus; private List lsClaseServicio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java index 11d7fbb6c..e3103b94a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingClasseTarifariaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; import java.util.HashMap; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -28,7 +29,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingClasseTa public class BusquedaPricingClasseTarifariaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaPricingClasseTarifariaController.class); + private static Logger log = LogManager.getLogger(BusquedaPricingClasseTarifariaController.class); @Autowired private transient PagedListWrapper plwPricingClasseTarifaria; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java index cc25fcee2..2a9265028 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/BusquedaPricingController.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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -74,7 +75,7 @@ public class BusquedaPricingController extends MyGenericForwardComposer { @Autowired private ParadaService paradaService; - private static Logger log = Logger.getLogger(BusquedaPricingController.class); + private static Logger log = LogManager.getLogger(BusquedaPricingController.class); public List getLsPricing() { return lsPricing; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingAsientoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingAsientoController.java index 28c651119..d6e744a82 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingAsientoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingAsientoController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ public class EditarPricingAsientoController extends MyGenericForwardComposer { private MyTextboxDecimal porcentaje; private Intbox numeasiento; private ConstraintPorcentagem ct; - private static Logger log = Logger.getLogger(EditarPricingAsientoController.class); + private static Logger log = LogManager.getLogger(EditarPricingAsientoController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCategoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCategoriaController.java index f6c5c0a07..d90684520 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCategoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCategoriaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarPricingCategoriaController extends MyGenericForwardComposer { private PricingCategoria pricingCategoria; private MyListbox pricingCategoriaList; private Combobox cmbCategoria; - private static Logger log = Logger.getLogger(EditarPricingCategoriaController.class); + private static Logger log = LogManager.getLogger(EditarPricingCategoriaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingClaseController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingClaseController.java index 095795847..227fc4695 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingClaseController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingClaseController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -41,7 +42,7 @@ public class EditarPricingClaseController extends MyGenericForwardComposer { private PricingClase pricingClase; private MyListbox pricingClaseList; private Combobox cmbClase; - private static Logger log = Logger.getLogger(EditarPricingClaseController.class); + private static Logger log = LogManager.getLogger(EditarPricingClaseController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java index f6098f658..796e1b093 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingController.java @@ -12,7 +12,8 @@ import java.util.List; import java.util.Map; import java.util.logging.Level; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -112,7 +113,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingVigencia public class EditarPricingController extends PricingController { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingController.class); + private static Logger log = LogManager.getLogger(EditarPricingController.class); @Autowired private PricingService pricingService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java index 82e680e35..77ce13167 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCorridaController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -64,7 +65,7 @@ public class EditarPricingCorridaController extends MyGenericForwardComposer { private Combobox cmbTipoServicio; private Timebox timeInicio; private Timebox timeFin; - private static Logger log = Logger.getLogger(EditarPricingCorridaController.class); + private static Logger log = LogManager.getLogger(EditarPricingCorridaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCtrlController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCtrlController.java index 5a3f6ce7f..7f1b6e5c4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCtrlController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingCtrlController.java @@ -4,7 +4,8 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -25,7 +26,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Scope("prototype") public class EditarPricingCtrlController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarPricingCtrlController.class); + private static Logger log = LogManager.getLogger(EditarPricingCtrlController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java index 8200dfb9c..3a94fcd74 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingDiaController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarPricingDiaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingDiaController.class); + private static Logger log = LogManager.getLogger(EditarPricingDiaController.class); @Autowired private PricingDiaService pricingDiaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java index 7e99d8d2f..c74e29f99 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java @@ -13,7 +13,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.Hibernate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -78,7 +79,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingEspecifi public class EditarPricingEspecificoController extends PricingController { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingController.class); + private static Logger log = LogManager.getLogger(EditarPricingController.class); @Autowired private PricingEspecificoService pricingEspecificoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java index 0bdaf4439..f210d5f7f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoOcupacionController.java @@ -6,7 +6,8 @@ import java.util.List; import java.util.Locale; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; public class EditarPricingEspecificoOcupacionController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingEspecificoOcupacionController.class); + private static Logger log = LogManager.getLogger(EditarPricingEspecificoOcupacionController.class); private PricingEspecifico pricingEspecifico; private PricingEspecificoOcupacion pricingEspecificoOcupacion; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingFormapagoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingFormapagoController.java index c615119ce..e27d230cc 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingFormapagoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingFormapagoController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -26,7 +27,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarPricingFormapagoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingFormapagoController.class); + private static Logger log = LogManager.getLogger(EditarPricingFormapagoController.class); @Autowired private FormaPagoService formaPagoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingImporteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingImporteController.java index b15e3ce57..5b9ee2387 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingImporteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingImporteController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -46,7 +47,7 @@ public class EditarPricingImporteController extends MyGenericForwardComposer { private MyListbox pricingImporteList; private Combobox cmbMoneda; private MyTextboxDecimal importe; - private static Logger log = Logger.getLogger(EditarPricingImporteController.class); + private static Logger log = LogManager.getLogger(EditarPricingImporteController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMarcaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMarcaController.java index 390426bb2..1a80705c1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMarcaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMarcaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarPricingMarcaController extends MyGenericForwardComposer { private PricingMarca pricingMarca; private MyListbox pricingMarcaList; private Combobox cmbMarca; - private static Logger log = Logger.getLogger(EditarPricingMarcaController.class); + private static Logger log = LogManager.getLogger(EditarPricingMarcaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java index 1a7ea9617..75f3fc289 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingMercadoController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -46,7 +47,7 @@ public class EditarPricingMercadoController extends MyGenericForwardComposer { private MyListbox pricingMercadoList; private Combobox cmbOrigen; private Combobox cmbDestino; - private static Logger log = Logger.getLogger(EditarPricingMercadoController.class); + private static Logger log = LogManager.getLogger(EditarPricingMercadoController.class); private List lsPricingConexao; private MyListbox pricingRutaList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaAutomaticoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaAutomaticoController.java index 076a394fa..3977f765b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaAutomaticoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaAutomaticoController.java @@ -7,7 +7,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -59,7 +60,7 @@ public class EditarPricingOcupaAntecipaAutomaticoController extends MyGenericFor private Pricing pricing; private ConstraintPorcentagem ct; - private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class); + private static Logger log = LogManager.getLogger(EditarPricingOcupaAntecipaController.class); @SuppressWarnings("unchecked") @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java index fbe4464bc..f20e73112 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingOcupaAntecipaController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; public class EditarPricingOcupaAntecipaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingOcupaAntecipaController.class); + private static Logger log = LogManager.getLogger(EditarPricingOcupaAntecipaController.class); @Autowired private PricingOcupaAntecipaService pricingOcupaAntecipaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingPuntoVentaController.java index f46f4b2be..d7059bb6d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingPuntoVentaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingPuntoVentaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ public class EditarPricingPuntoVentaController extends MyGenericForwardComposer private PricingPuntoVenta pricingPuntoVenta; private MyListbox pricingPuntoVentaList; private Combobox cmbPuntoVenta; - private static Logger log = Logger.getLogger(EditarPricingPuntoVentaController.class); + private static Logger log = LogManager.getLogger(EditarPricingPuntoVentaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingRutaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingRutaController.java index fa3640717..c3ff334d0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingRutaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingRutaController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.ArrayList; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ public class EditarPricingRutaController extends MyGenericForwardComposer { private PricingRuta pricingRuta; private MyListbox pricingRutaList; private Combobox cmbRuta; - private static Logger log = Logger.getLogger(EditarPricingRutaController.class); + private static Logger log = LogManager.getLogger(EditarPricingRutaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoPtoVtaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoPtoVtaController.java index ebd7ca61f..88ff32ad8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoPtoVtaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoPtoVtaController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarPricingTipoPtoVtaController extends MyGenericForwardComposer private PricingTipoPtoVta pricingTipoPtoVta; private MyListbox pricingTipoPtoVtaList; private Combobox cmbTipoPtoVta; - private static Logger log = Logger.getLogger(EditarPricingTipoPtoVtaController.class); + private static Logger log = LogManager.getLogger(EditarPricingTipoPtoVtaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoServicioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoServicioController.java index a6d89ea1b..b74eb1f15 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoServicioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingTipoServicioController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -45,7 +46,7 @@ public class EditarPricingTipoServicioController extends MyGenericForwardCompose private PricingTipoServicio pricingTipoServicio; private MyListbox pricingTipoServicioList; private Combobox cmbTipoServicio; - private static Logger log = Logger.getLogger(EditarPricingTipoServicioController.class); + private static Logger log = LogManager.getLogger(EditarPricingTipoServicioController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingVigenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingVigenciaController.java index c52603a2c..e40d4922c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingVigenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingVigenciaController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ public class EditarPricingVigenciaController extends MyGenericForwardComposer { private PricingVigenciaService pricingVigenciaService; private PricingVigencia pricingVigencia; private MyListbox pricingVigenciaList; - private static Logger log = Logger.getLogger(EditarPricingVigenciaController.class); + private static Logger log = LogManager.getLogger(EditarPricingVigenciaController.class); private Datebox fecinicioviaje; private Datebox fecfinviaje; private Datebox fecinicioventa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoController.java index 3353ec1c3..47d34ad9b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoController.java @@ -16,7 +16,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.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFFont; @@ -90,7 +91,7 @@ public class ModificacionMasivaPricingEspecificoController extends MyGenericForw private MyListbox origemList; private MyListbox destinoList; - private static Logger log = Logger.getLogger(ModificacionMasivaPricingEspecificoController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaPricingEspecificoController.class); public List getLsEmpresas() { return lsEmpresas; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoUploadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoUploadController.java index be36c6f44..d711fd802 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoUploadController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/ModificacionMasivaPricingEspecificoUploadController.java @@ -14,7 +14,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.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -64,7 +65,7 @@ public class ModificacionMasivaPricingEspecificoUploadController extends MyGener int registrosAlterados = 0; int registrosCancelados = 0; - private static Logger log = Logger.getLogger(ModificacionMasivaAliasUploadController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaAliasUploadController.class); @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java index ae2a13c14..14185a794 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciaFechamentoController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -46,7 +47,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendas @Scope("prototype") public class RelatorioAgenciaFechamentoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioAgenciaFechamentoController.class); + private static Logger log = LogManager.getLogger(RelatorioAgenciaFechamentoController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciasNaoImportadasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciasNaoImportadasController.java index 969831596..ff9a8b077 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciasNaoImportadasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAgenciasNaoImportadasController.java @@ -6,7 +6,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Scope("prototype") public class RelatorioAgenciasNaoImportadasController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioAgenciasNaoImportadasController.class); + private static Logger log = LogManager.getLogger(RelatorioAgenciasNaoImportadasController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java index 3abbd82c3..e4077f072 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoController.java @@ -12,7 +12,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -52,7 +53,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCorridaAproveit public class RelatorioAproveitamentoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioAproveitamentoController.class); + private static Logger log = LogManager.getLogger(RelatorioAproveitamentoController.class); @Autowired private CorridaService corridaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoFinanceiroController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoFinanceiroController.java index 8bdc69b52..7b0b0b658 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoFinanceiroController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioAproveitamentoFinanceiroController.java @@ -12,7 +12,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -48,7 +49,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioAprove public class RelatorioAproveitamentoFinanceiroController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioAproveitamentoFinanceiroController.class); + private static Logger log = LogManager.getLogger(RelatorioAproveitamentoFinanceiroController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java index 3b4c9cb50..20f4810c8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoBGMController.java @@ -8,7 +8,8 @@ import javax.activation.MimetypesFileTypeMap; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class RelatorioArquivoBGMController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioArquivoBGMController.class); + private static Logger log = LogManager.getLogger(RelatorioArquivoBGMController.class); private MyComboboxEmpresa cmbEmpresa; private MyComboboxPuntoVenta cmbPuntoVenta; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoReceitasDespesasDivController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoReceitasDespesasDivController.java index 27b45a5ff..223fca647 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoReceitasDespesasDivController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioArquivoReceitasDespesasDivController.java @@ -12,7 +12,8 @@ import javax.activation.MimetypesFileTypeMap; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class RelatorioArquivoReceitasDespesasDivController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioArquivoReceitasDespesasDivController.class); + private static Logger log = LogManager.getLogger(RelatorioArquivoReceitasDespesasDivController.class); private MyComboboxEmpresa cmbEmpresa; private MyComboboxPuntoVenta cmbPuntoVenta; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoAutomaticoECFController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoAutomaticoECFController.java index ff52cad36..89b1eb06d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoAutomaticoECFController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioCancelamentoAutomaticoECFController.java @@ -11,7 +11,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -56,7 +57,7 @@ public class RelatorioCancelamentoAutomaticoECFController extends MyGenericForwa * */ private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioCancelamentoAutomaticoECFController.class); + private static Logger log = LogManager.getLogger(RelatorioCancelamentoAutomaticoECFController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioConferenciaFormularioFisicoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioConferenciaFormularioFisicoController.java index f28565629..d13e38ea9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioConferenciaFormularioFisicoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioConferenciaFormularioFisicoController.java @@ -7,7 +7,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class RelatorioConferenciaFormularioFisicoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioConferenciaFormularioFisicoController.class); + private static Logger log = LogManager.getLogger(RelatorioConferenciaFormularioFisicoController.class); private MyComboboxEstandar cmbEmpresa; private MyComboboxPuntoVenta cmbPuntoVenta; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioController.java index 3258f590e..701287c08 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioController.java @@ -9,7 +9,8 @@ import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Calendar; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.zkoss.util.media.AMedia; @@ -35,7 +36,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class RelatorioController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioController.class); + private static Logger log = LogManager.getLogger(RelatorioController.class); private Div divResultadoRelatorio; private Iframe iframeRelatorio; private Toolbarbutton btnSalvarPDF; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDERPRController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDERPRController.java index 5c68e79e0..7ee868d82 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDERPRController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDERPRController.java @@ -7,7 +7,8 @@ import java.util.ArrayList; import java.util.Arrays; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioAprove public class RelatorioDERPRController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioDERPRController.class); + private static Logger log = LogManager.getLogger(RelatorioDERPRController.class); private Datebox datInicial; private Datebox datFinal; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java index b2a2886c7..4c6632973 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDemandasController.java @@ -13,7 +13,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -55,7 +56,7 @@ public class RelatorioDemandasController extends MyGenericForwardComposer { * */ private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioDemandasController.class); + private static Logger log = LogManager.getLogger(RelatorioDemandasController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmbarqueLocalidadeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmbarqueLocalidadeController.java index e54102f84..1ca5dda50 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmbarqueLocalidadeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmbarqueLocalidadeController.java @@ -21,7 +21,8 @@ import java.util.TreeMap; 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.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFFont; @@ -70,7 +71,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioEmbarqueLocalidadeController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioEmbarqueLocalidadeController.class); + private static Logger log = LogManager.getLogger(RelatorioEmbarqueLocalidadeController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaOnibusController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaOnibusController.java index 4beb87562..d210aded4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaOnibusController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioEmpresaOnibusController.java @@ -7,7 +7,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Scope("prototype") public class RelatorioEmpresaOnibusController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioEmpresaOnibusController.class); + private static Logger log = LogManager.getLogger(RelatorioEmpresaOnibusController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGEPANController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGEPANController.java index eda4929de..ef8e7320d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGEPANController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGEPANController.java @@ -7,7 +7,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioLinhaH @Scope("prototype") public class RelatorioGratuidadeAGEPANController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(RelatorioGratuidadeAGEPANController.class); + private static Logger log = LogManager.getLogger(RelatorioGratuidadeAGEPANController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGERController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGERController.java index 8ec809888..42c3eff2e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGERController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeAGERController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -73,7 +74,7 @@ public class RelatorioGratuidadeAGERController extends MyGenericForwardComposer private MyListbox selectedTipoGratuidadeList; private List listSelectedTipoGratuidade; - private static Logger log = Logger.getLogger(RelatorioGratuidadeAGERController.class); + private static Logger log = LogManager.getLogger(RelatorioGratuidadeAGERController.class); public void onClick$btnRemoveTipoGratuidade(Event ev) throws InterruptedException { Categoria categoria = (Categoria) selectedTipoGratuidadeList.getSelectedItem().getValue(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeARTESPController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeARTESPController.java index c2281b63e..107edd2d6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeARTESPController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeARTESPController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -72,7 +73,7 @@ public class RelatorioGratuidadeARTESPController extends MyGenericForwardCompose private Checkbox chkIndTabelaPreco; private List listSelectedTipoGratuidade; - private static Logger log = Logger.getLogger(RelatorioGratuidadeARTESPController.class); + private static Logger log = LogManager.getLogger(RelatorioGratuidadeARTESPController.class); @Autowired private EstadoService estadoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeIdosoDeficienteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeIdosoDeficienteController.java index d5df0a22c..a69079106 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeIdosoDeficienteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioGratuidadeIdosoDeficienteController.java @@ -7,7 +7,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -29,7 +30,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Scope("prototype") public class RelatorioGratuidadeIdosoDeficienteController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioGratuidadeIdosoDeficienteController.class); + private static Logger log = LogManager.getLogger(RelatorioGratuidadeIdosoDeficienteController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioImpressaoPosteriorController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioImpressaoPosteriorController.java index a5e2cf912..13383bb3d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioImpressaoPosteriorController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioImpressaoPosteriorController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderParadaImpressao @Scope("prototype") public class RelatorioImpressaoPosteriorController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioImpressaoPosteriorController.class); + private static Logger log = LogManager.getLogger(RelatorioImpressaoPosteriorController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java index 0d873ec2d..135e27b51 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioIndiceIRKController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioIndice public class RelatorioIndiceIRKController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioIndiceIRKController.class); + private static Logger log = LogManager.getLogger(RelatorioIndiceIRKController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java index be1534a96..23f3645bb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioLinhasHorarioController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -49,7 +50,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioLinhaH public class RelatorioLinhasHorarioController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioLinhasHorarioController.class); + private static Logger log = LogManager.getLogger(RelatorioLinhasHorarioController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java index c554208c0..fd32e0f0e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMensalDAERController.java @@ -11,7 +11,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -48,7 +49,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; @Scope("prototype") public class RelatorioMensalDAERController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioMensalDAERController.class); + private static Logger log = LogManager.getLogger(RelatorioMensalDAERController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMmphDerController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMmphDerController.java index 6f44fbdeb..7345b1fb6 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMmphDerController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMmphDerController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioAprove public class RelatorioMmphDerController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioMmphDerController.class); + private static Logger log = LogManager.getLogger(RelatorioMmphDerController.class); private static final String TITULO_EXPORTACAO = Labels.getLabel("relatorioLinhasHorarioController.window.title"); @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java index b1202c6a4..b97ba328d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioMovimentosAtrasoController.java @@ -38,7 +38,7 @@ public class RelatorioMovimentosAtrasoController extends MyGenericForwardCompose private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(RelatorioMovimentosAtrasoController.class); + private static Logger log = LoggerFactory.getLogger(RelatorioMovimentosAtrasoController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoBilhetesController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoBilhetesController.java index 260a11ec2..7a9fb095f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoBilhetesController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoBilhetesController.java @@ -29,7 +29,7 @@ public class RelatorioObservacaoBilhetesController extends MyGenericForwardCompo private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(RelatorioObservacaoBilhetesController.class); + private static Logger log = LoggerFactory.getLogger(RelatorioObservacaoBilhetesController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java index bab4c9d38..9839f4cba 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoConferenciaMovimentoController.java @@ -33,7 +33,7 @@ public class RelatorioObservacaoConferenciaMovimentoController extends MyGeneric private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(RelatorioObservacaoConferenciaMovimentoController.class); + private static Logger log = LoggerFactory.getLogger(RelatorioObservacaoConferenciaMovimentoController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoEventosFinaneirosController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoEventosFinaneirosController.java index ca9a2a3c4..48d6a80a0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoEventosFinaneirosController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioObservacaoEventosFinaneirosController.java @@ -29,7 +29,7 @@ public class RelatorioObservacaoEventosFinaneirosController extends MyGenericFor private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(RelatorioObservacaoEventosFinaneirosController.class); + private static Logger log = LoggerFactory.getLogger(RelatorioObservacaoEventosFinaneirosController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java index 4f47b72a3..614e56e12 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioOperacionalFinanceiroController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -68,7 +69,7 @@ public class RelatorioOperacionalFinanceiroController extends MyGenericForwardCo private MyListbox tramoList; private MyListbox tramoListSelList; - private static Logger log = Logger.getLogger(RelatorioOperacionalFinanceiroController.class); + private static Logger log = LogManager.getLogger(RelatorioOperacionalFinanceiroController.class); public void onClick$btnPesquisaLinha(Event ev) { executarPesquisaLinha(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassagensAGERController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassagensAGERController.java index e501eb7e0..20aa611c5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassagensAGERController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioPassagensAGERController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -67,7 +68,7 @@ public class RelatorioPassagensAGERController extends MyGenericForwardComposer { private MyListbox linhaList; private MyListbox linhaListSelList; - private static Logger log = Logger.getLogger(RelatorioPassagensAGERController.class); + private static Logger log = LogManager.getLogger(RelatorioPassagensAGERController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java index f2c32d95f..8e8a2fdae 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioReceitaDiariaAgenciaController.java @@ -12,7 +12,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -114,7 +115,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom private Radio radDataFechamento; private MyListbox puntoVentaConfiguracaoList; private Paging pagingPuntoVentaConfiguracao; - private static Logger log; + private static final Logger log = LogManager.getLogger(RelatorioReceitaDiariaAgenciaController.class); public Checkbox getSomenteCancelados() { return somenteCancelados; } @@ -474,7 +475,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom @Override public void doAfterCompose(Component comp) throws Exception { - log = Logger.getLogger(RelatorioReceitaDiariaAgenciaController.class); + lsEstado = estadoService.obtenerTodos(); lsEmpresa = empresaService.obtenerTodos(); lsGrupoRuta = grupoRutaService.obtenerTodos(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java index 99ee1ddcd..e17dbdd9d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSapController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderFechamentoCntcorrente; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.quartz.JobDetail; import org.quartz.Scheduler; import org.quartz.SchedulerException; @@ -40,7 +41,7 @@ public class RelatorioSapController extends MyGenericForwardComposer { private static final String TITULO = "relatorioSap.window.title"; private static final long serialVersionUID = -6110350409404675022L; - private static Logger log = Logger.getLogger(RelatorioSapController.class); + private static Logger log = LogManager.getLogger(RelatorioSapController.class); private MyListbox boletoFechamentoList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSieController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSieController.java index 413e9b2d8..42c594abb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSieController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSieController.java @@ -18,7 +18,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; 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.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; @@ -61,7 +62,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderGratuidadeProfe public class RelatorioSieController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioSieController.class); + private static Logger log = LogManager.getLogger(RelatorioSieController.class); private Integer MAX_BUFFER_ZIP = Integer.valueOf(18024); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java index df6768296..039555763 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioSisdapController.java @@ -13,7 +13,8 @@ import java.util.zip.Deflater; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderDescontoGratuid public class RelatorioSisdapController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioSisdapController.class); + private static Logger log = LogManager.getLogger(RelatorioSisdapController.class); private Integer MAX_BUFFER_ZIP = Integer.valueOf(18024); diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java index 5cbb941d6..1ebb576fe 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTrechoVendidoController.java @@ -12,7 +12,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -46,7 +47,7 @@ public class RelatorioTrechoVendidoController extends MyGenericForwardComposer { private static final String TODOS = "TODAS"; private static final String TODOS_VALUE = new Integer(-1).toString(); - private static Logger log = Logger.getLogger(RelatorioTrechoVendidoController.class); + private static Logger log = LogManager.getLogger(RelatorioTrechoVendidoController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java index c66f26ed8..67d2085e0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaBilhetePorEmpresaAutorizadoraController.java @@ -10,7 +10,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -52,7 +53,7 @@ public class RelatorioVendaBilhetePorEmpresaAutorizadoraController extends MyGen * */ private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioVendaBilhetePorEmpresaAutorizadoraController.class); + private static Logger log = LogManager.getLogger(RelatorioVendaBilhetePorEmpresaAutorizadoraController.class); @Autowired private EmpresaService empresaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaEmbarcadaController.java index 4ea863a07..90f899a5e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendaEmbarcadaController.java @@ -8,7 +8,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -39,7 +40,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; public class RelatorioVendaEmbarcadaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioVendaEmbarcadaController.class); + private static Logger log = LogManager.getLogger(RelatorioVendaEmbarcadaController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroController.java index 8df14efc4..8578573d1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroController.java @@ -11,7 +11,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -50,7 +51,7 @@ public class RelatorioVendasBilheteiroController extends MyGenericForwardCompose * */ private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioVendasBilheteiroController.class); + private static Logger log = LogManager.getLogger(RelatorioVendasBilheteiroController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroSinteticoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroSinteticoController.java index b4e1039b1..d93faad7c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroSinteticoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasBilheteiroSinteticoController.java @@ -11,7 +11,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -57,7 +58,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendas public class RelatorioVendasBilheteiroSinteticoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioVendasBilheteiroSinteticoController.class); + private static Logger log = LogManager.getLogger(RelatorioVendasBilheteiroSinteticoController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasParcelamentoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasParcelamentoController.java index 5555c7189..dd78fe794 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasParcelamentoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioVendasParcelamentoController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRelatorioVendas @Scope("prototype") public class RelatorioVendasParcelamentoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioVendasParcelamentoController.class); + private static Logger log = LogManager.getLogger(RelatorioVendasParcelamentoController.class); @Autowired private DataSource dataSourceRead; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/sgti/GerarXMLExportacaoSGTI.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/sgti/GerarXMLExportacaoSGTI.java index b83026113..4553ab797 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/sgti/GerarXMLExportacaoSGTI.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/sgti/GerarXMLExportacaoSGTI.java @@ -27,7 +27,8 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -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.w3c.dom.Document; import org.w3c.dom.Element; @@ -42,7 +43,7 @@ public class GerarXMLExportacaoSGTI { private static final String SENTIDO_IDA_CORRIDA = "1"; - private static Logger log = Logger.getLogger(GerarXMLExportacaoSGTI.class); + private static Logger log = LogManager.getLogger(GerarXMLExportacaoSGTI.class); private RelatorioExportacaoSGTIController controller; private ExecutarExportacaoSGTI exportador; private ResultSet dadosTrecho; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditModuleDetailController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditModuleDetailController.java index 278d16c24..d8eccd438 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditModuleDetailController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditModuleDetailController.java @@ -4,7 +4,8 @@ O * To change this template, choose Tools | Templates */ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.zkoss.zk.ui.Component; @@ -20,7 +21,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class AuditModuleDetailController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(AuditModuleDetailController.class); + private static Logger log = LogManager.getLogger(AuditModuleDetailController.class); private Textbox txtEntityJson; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditoriaController.java index c5b10d80c..19ede9bcc 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/AuditoriaController.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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -51,7 +52,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEntityDetail; public class AuditoriaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(AuditoriaController.class); + private static Logger log = LogManager.getLogger(AuditoriaController.class); @Autowired private AuditModuleService auditModuleService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java index 59fec9d0c..fd1cab0f2 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaEstacionController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; import java.util.HashMap; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -49,7 +50,7 @@ public class BusquedaEstacionController extends MyGenericForwardComposer { private Textbox txtMAC; private Textbox txtIMEI; private Longbox txtNumCaja; - private static Logger log = Logger.getLogger(BusquedaEstacionController.class); + private static Logger log = LogManager.getLogger(BusquedaEstacionController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaFiscalImpressoraController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaFiscalImpressoraController.java index 9ee9f9270..66a51a379 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaFiscalImpressoraController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaFiscalImpressoraController.java @@ -4,7 +4,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ public class BusquedaFiscalImpressoraController extends MyGenericForwardComposer private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaFiscalImpressoraController.class); + private static Logger log = LogManager.getLogger(BusquedaFiscalImpressoraController.class); @Autowired private transient PagedListWrapper plwFiscalImpressora; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaIntegracaoTotvsController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaIntegracaoTotvsController.java index 59ca8bba5..d83f94d07 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaIntegracaoTotvsController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaIntegracaoTotvsController.java @@ -5,7 +5,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -40,7 +41,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCajaTotvs; @Scope("prototype") public class BusquedaIntegracaoTotvsController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaIntegracaoTotvsController.class); + private static Logger log = LogManager.getLogger(BusquedaIntegracaoTotvsController.class); private List lsEmpresas; private Combobox cmbEmpresa; private Combobox cmbEmpresaServico; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java index 2f67fe848..d4c3b00e8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaLogAuditoriaController.java @@ -11,7 +11,8 @@ import java.util.Map.Entry; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -46,7 +47,7 @@ import br.com.rjconsultores.auditador.enums.AuditadorTipoAlteracao; public class BusquedaLogAuditoriaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaLogAuditoriaController.class); + private static Logger log = LogManager.getLogger(BusquedaLogAuditoriaController.class); @Autowired private LogAuditoriaService logAuditoriaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaPerfilController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaPerfilController.java index 4faa840f3..e33440a0d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaPerfilController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/BusquedaPerfilController.java @@ -8,7 +8,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ import com.trg.search.Filter; public class BusquedaPerfilController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaPerfilController.class); + private static Logger log = LogManager.getLogger(BusquedaPerfilController.class); @Autowired private transient PagedListWrapper plwPerfil; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/CambiaContrasenaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/CambiaContrasenaController.java index e3ab34230..6dc8b3218 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/CambiaContrasenaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/CambiaContrasenaController.java @@ -1,7 +1,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class CambiaContrasenaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarUsuarioController.class); + private static Logger log = LogManager.getLogger(EditarUsuarioController.class); @Autowired private UsuarioService usuarioService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionController.java index 2a1dbc620..c236e5606 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionController.java @@ -11,7 +11,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -35,7 +36,7 @@ public class EditarAutorizacionController extends MyGenericForwardComposer { private AutorizacionService autorizacionService; private Autorizacion autorizacion; private MyListbox autorizacionList; - private static Logger log = Logger.getLogger(EditarAutorizacionController.class); + private static Logger log = LogManager.getLogger(EditarAutorizacionController.class); private Textbox txtNombAutorizacion; private Textbox txtDescAutorizacion; private Button btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionPerfilController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionPerfilController.java index 2939b227c..e7c42e6f7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionPerfilController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarAutorizacionPerfilController.java @@ -15,7 +15,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -48,7 +49,7 @@ public class EditarAutorizacionPerfilController extends MyGenericForwardComposer private Combobox cmbPerfil; private Combobox cmbAutorizacion; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarAutorizacionPerfilController.class); + private static Logger log = LogManager.getLogger(EditarAutorizacionPerfilController.class); public AutorizacionPerfil getAutorizacionPerfil() { return autorizacionPerfil; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarCompanhiaBancariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarCompanhiaBancariaController.java index d785037b5..03fc32e44 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarCompanhiaBancariaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarCompanhiaBancariaController.java @@ -20,7 +20,8 @@ import java.util.Calendar; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -53,7 +54,7 @@ public class EditarCompanhiaBancariaController extends MyGenericForwardComposer private MyListbox merchantBancarioList; private Textbox txtCVECompania; private Textbox txtCVESucursal; - private static Logger log = Logger.getLogger(EditarCompanhiaBancariaController.class); + private static Logger log = LogManager.getLogger(EditarCompanhiaBancariaController.class); public CompaniaBancaria getCompaniaBancaria() { return companiaBancaria; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java index cbf89d522..9a3711dab 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarEstacionController.java @@ -11,7 +11,8 @@ import java.util.List; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Predicate; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -106,7 +107,7 @@ public class EditarEstacionController extends MyGenericForwardComposer { private List lsEstacionImpresora; private List lsTipoImpressora; - private static Logger log = Logger.getLogger(EditarEstacionController.class); + private static Logger log = LogManager.getLogger(EditarEstacionController.class); private Textbox txtNomImpressora; private Textbox txtNomImpressoraSeguro; private Textbox txtNomImpressoraRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarFiscalImpressoraController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarFiscalImpressoraController.java index a9d46fdfc..634f662bf 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarFiscalImpressoraController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarFiscalImpressoraController.java @@ -5,7 +5,8 @@ import java.util.Calendar; import java.util.Iterator; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -34,7 +35,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarFiscalImpressoraController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarFiscalImpressoraController.class); + private static Logger log = LogManager.getLogger(EditarFiscalImpressoraController.class); @Autowired private FiscalImpressoraService fiscalImpressoraService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarIntegracaoTotvsController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarIntegracaoTotvsController.java index 89577ad77..303e3c26b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarIntegracaoTotvsController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarIntegracaoTotvsController.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; import java.math.BigDecimal; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; import org.zkoss.zk.ui.Component; @@ -34,7 +35,7 @@ public class EditarIntegracaoTotvsController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; private Caja caja; private MyListbox coloniaList; - private static Logger log = Logger.getLogger(EditarIntegracaoTotvsController.class); + private static Logger log = LogManager.getLogger(EditarIntegracaoTotvsController.class); private MyTextbox txtNumBilhete; private Intbox txtpuntoVentaId; private MyTextbox txtFechaVenta; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMensajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMensajeController.java index 4307bd9fa..a91e7ff74 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMensajeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMensajeController.java @@ -6,7 +6,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -44,7 +45,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderMensajePuntoVen public class EditarMensajeController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarMensajeController.class); + private static Logger log = LogManager.getLogger(EditarMensajeController.class); @Autowired private MensajePuntaVentaService mensajePuntoVentaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMenuController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMenuController.java index a5bebca09..67c2eaf01 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMenuController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMenuController.java @@ -13,7 +13,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarMenuController extends MyGenericForwardComposer { private MyListbox menuList; private Textbox txtNombFuncion; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarMenuController.class); + private static Logger log = LogManager.getLogger(EditarMenuController.class); public FuncionSistema getFuncionSistema() { return funcionSistema; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.java index 123b04717..209397f1e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarOperadorEmbarcadaController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -57,7 +58,7 @@ import com.trg.search.Filter; public class EditarOperadorEmbarcadaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarOperadorEmbarcadaController.class); + private static Logger log = LogManager.getLogger(EditarOperadorEmbarcadaController.class); private Textbox txtLogin; private Intbox txtIdLinha; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPerfilController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPerfilController.java index 3336e95ea..45703091a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPerfilController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPerfilController.java @@ -13,7 +13,8 @@ import java.util.Iterator; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -55,7 +56,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPermisoSelecion public class EditarPerfilController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPerfilController.class); + private static Logger log = LogManager.getLogger(EditarPerfilController.class); @Autowired private PerfilService perfilService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java index 093634641..1f026caec 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarPricingClasseTarifariaController.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; public class EditarPricingClasseTarifariaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarPricingClasseTarifariaController.class); + private static Logger log = LogManager.getLogger(EditarPricingClasseTarifariaController.class); @Autowired private PricingClasseTarifariaService pricingClasseTarifariaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarSistemaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarSistemaController.java index d484098be..46bf38328 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarSistemaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarSistemaController.java @@ -10,7 +10,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import java.util.Calendar; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -36,7 +37,7 @@ public class EditarSistemaController extends MyGenericForwardComposer { private MyListbox sistemaList; private Textbox txtNome; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarSistemaController.class); + private static Logger log = LogManager.getLogger(EditarSistemaController.class); public Sistema getSistema() { return sistema; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarUsuarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarUsuarioController.java index f6dfd771d..c83e84fa8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarUsuarioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarUsuarioController.java @@ -11,7 +11,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -75,7 +76,7 @@ public class EditarUsuarioController extends MyGenericForwardComposer { private static final String TITULO_CONTROLER = "editarUsuarioController.window.title"; private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarUsuarioController.class); + private static Logger log = LogManager.getLogger(EditarUsuarioController.class); private static final String CONTRASENA_VACIA = "**********"; @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ExtrairBpeXmlController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ExtrairBpeXmlController.java index 5a2b2a918..bea878b06 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ExtrairBpeXmlController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ExtrairBpeXmlController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -30,7 +31,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Scope("prototype") public class ExtrairBpeXmlController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(ExtrairBpeXmlController.class); + private static Logger log = LogManager.getLogger(ExtrairBpeXmlController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/PainelEcfController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/PainelEcfController.java index 02c729d29..0521e61c8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/PainelEcfController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/PainelEcfController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -22,7 +23,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderMonitoramentoCR public class PainelEcfController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(PainelEcfController.class); + private static Logger log = LogManager.getLogger(PainelEcfController.class); @Autowired private MonitoramentoCCFService monitoramentoCCFService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ReenvioBpeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ReenvioBpeController.java index 5356992e4..7dd98bca1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ReenvioBpeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/ReenvioBpeController.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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -35,7 +36,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEstadoUf; @Scope("prototype") public class ReenvioBpeController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(ReenvioBpeController.class); + private static Logger log = LogManager.getLogger(ReenvioBpeController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/api/LimparCacheApiController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/api/LimparCacheApiController.java index ec7637807..89ce8f0b2 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/api/LimparCacheApiController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/api/LimparCacheApiController.java @@ -4,7 +4,8 @@ import java.util.Arrays; 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.springframework.context.ApplicationContext; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -35,7 +36,7 @@ public class LimparCacheApiController extends MyGenericForwardComposer { private static final String TITULO = "limparCacheAPI.title"; private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(LimparCacheApiController.class); + private static Logger log = LogManager.getLogger(LimparCacheApiController.class); private List lsCachesApiEnum; private Combobox cmbItem; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EditarContigenciaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EditarContigenciaController.java index 2161f778e..413469a00 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EditarContigenciaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EditarContigenciaController.java @@ -5,7 +5,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad.contingen 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -51,7 +52,7 @@ public class EditarContigenciaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarContigenciaController.class); + private static Logger log = LogManager.getLogger(EditarContigenciaController.class); @Autowired private EstadoService estadoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EventListenerOnClickContingenciaBotaoContingencia.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EventListenerOnClickContingenciaBotaoContingencia.java index 1526c80d2..f6dbe5f2e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EventListenerOnClickContingenciaBotaoContingencia.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/contingencia/EventListenerOnClickContingenciaBotaoContingencia.java @@ -8,7 +8,8 @@ import javax.mail.AuthenticationFailedException; import javax.mail.SendFailedException; 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.zkoss.util.resource.Labels; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; @@ -24,7 +25,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class EventListenerOnClickContingenciaBotaoContingencia implements EventListener { - private static Logger log = Logger.getLogger(EventListenerOnClickContingenciaBotaoContingencia.class); + private static Logger log = LogManager.getLogger(EventListenerOnClickContingenciaBotaoContingencia.class); private MyGenericForwardComposer controller; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java index f17387fc1..8fc98ab62 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteController.java @@ -9,7 +9,8 @@ import java.util.Map; 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.brazilutils.br.cpfcnpj.Cpf; import org.brazilutils.validation.ValidationException; import org.springframework.beans.factory.annotation.Autowired; @@ -94,7 +95,7 @@ public class EditarClienteController extends MyGenericForwardComposer { private static final String CPF = "CPF"; private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarClienteController.class); + private static Logger log = LogManager.getLogger(EditarClienteController.class); private ClienteService clienteService; private MotivoViajeService motivoViajeService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteCursoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteCursoController.java index bc504fff2..4e429e218 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteCursoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarClienteCursoController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ public class EditarClienteCursoController extends MyGenericForwardComposer { private Cliente cliente; private MyListbox cursoList; - private static Logger log = Logger.getLogger(EditarClienteCursoController.class); + private static Logger log = LogManager.getLogger(EditarClienteCursoController.class); // private MyTextbox txtNome; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarGeneracionTarjetaSAController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarGeneracionTarjetaSAController.java index a7392222e..b14e41da4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarGeneracionTarjetaSAController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarGeneracionTarjetaSAController.java @@ -9,7 +9,8 @@ import java.util.Calendar; import java.util.List; import java.util.Random; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -54,7 +55,7 @@ public class EditarGeneracionTarjetaSAController extends MyGenericForwardCompose private Button btnApagarGeneracion; private Button btnGenerar; private Label qtdFolios; - private static Logger log = Logger.getLogger(EditarGeneracionTarjetaSAController.class); + private static Logger log = LogManager.getLogger(EditarGeneracionTarjetaSAController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaMasivoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaMasivoController.java index 1446c938e..b64a82582 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaMasivoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaMasivoController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.zkoss.zk.ui.Component; @@ -43,7 +44,7 @@ public class EditarParamAcumulaMasivoController extends MyGenericForwardComposer private List lsEmpresa; private ParamAcumulaMasivo paramAcumulaMasivo; private MyListbox paramAcumulaMasivoList; - private static Logger log = Logger.getLogger(EditarParamAcumulaMasivoController.class); + private static Logger log = LogManager.getLogger(EditarParamAcumulaMasivoController.class); private Combobox cmbEmpresa; private Datebox fecInicio; private Datebox fecFinal; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaPuntoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaPuntoController.java index 63a7fc92e..53c4aa987 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaPuntoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamAcumulaPuntoController.java @@ -20,7 +20,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; 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.context.annotation.Scope; import org.zkoss.zk.ui.Component; @@ -59,7 +60,7 @@ public class EditarParamAcumulaPuntoController extends MyGenericForwardComposer private List lsFormaPago; private ParamAcumulaPunto paramAcumulaPunto; private MyListbox paramAcumulaPuntoList; - private static Logger log = Logger.getLogger(EditarParamAcumulaPuntoController.class); + private static Logger log = LogManager.getLogger(EditarParamAcumulaPuntoController.class); private Combobox cmbOrigem; private Combobox cmbDestino; private Combobox cmbEmpresa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCanjePuntoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCanjePuntoController.java index 793ce35fd..8d164224a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCanjePuntoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCanjePuntoController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; import java.util.Calendar; -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.context.annotation.Scope; import org.zkoss.zk.ui.Component; @@ -43,7 +44,7 @@ public class EditarParamCanjePuntoController extends MyGenericForwardComposer { private MyTextboxDecimal porcentaje; private ParamCanjePunto paramCanjePunto; private MyListbox paramCanjePuntoList; - private static Logger log = Logger.getLogger(EditarParamCanjePuntoController.class); + private static Logger log = LogManager.getLogger(EditarParamCanjePuntoController.class); private MyComboboxParada cmbOrigem; private MyComboboxParada cmbDestino; private Datebox fecInicio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCompraPuntoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCompraPuntoController.java index 388809daa..e372fa279 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCompraPuntoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCompraPuntoController.java @@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; 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.context.annotation.Scope; import org.zkoss.zk.ui.Component; @@ -37,7 +38,7 @@ public class EditarParamCompraPuntoController extends MyGenericForwardComposer { private ParamCompraPuntoService paramCompraPuntoService; private ParamCompraPunto paramCompraPunto; private MyListbox paramCompraPuntoList; - private static Logger log = Logger.getLogger(EditarParamCompraPuntoController.class); + private static Logger log = LogManager.getLogger(EditarParamCompraPuntoController.class); private Datebox fecInicio; private BusquedaParamCompraPuntoController busquedaParamCompraPuntoController; private Datebox fecFinal; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCostoTarjetaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCostoTarjetaController.java index e36c5c9e9..50aabec60 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCostoTarjetaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarParamCostoTarjetaController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; 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.context.annotation.Scope; import org.zkoss.zk.ui.Component; @@ -42,7 +43,7 @@ public class EditarParamCostoTarjetaController extends MyGenericForwardComposer private BusquedaParamCostoTarjetaController busquedaParamCostoTarjetaController; private ParamCostoTarjeta paramCostoTarjeta; private MyListbox paramCostoTarjetaList; - private static Logger log = Logger.getLogger(EditarParamCostoTarjetaController.class); + private static Logger log = LogManager.getLogger(EditarParamCostoTarjetaController.class); private Combobox cmbEmpresa; private MyTextboxDecimal vlrInicial; private Button btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoDomicilioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoDomicilioController.java index b0baefd5d..20802e165 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoDomicilioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoDomicilioController.java @@ -11,7 +11,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -39,7 +40,7 @@ public class EditarTipoDomicilioController extends MyGenericForwardComposer { private Textbox txtNome; BusquedaTipoDomicilioController busquedaTipoDomicilioController; private Textbox txtCve; - private static Logger log = Logger.getLogger(EditarTipoDomicilioController.class); + private static Logger log = LogManager.getLogger(EditarTipoDomicilioController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoMovimientoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoMovimientoController.java index 5a8822d32..116554c0f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoMovimientoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoMovimientoController.java @@ -11,7 +11,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -38,7 +39,7 @@ public class EditarTipoMovimientoController extends MyGenericForwardComposer { private Button btnApagar; private Textbox txtNome; private BusquedaTipoMovimientoController busquedaTipoMovimientoController; - private static Logger log = Logger.getLogger(EditarTipoMovimientoController.class); + private static Logger log = LogManager.getLogger(EditarTipoMovimientoController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoOcupacionController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoOcupacionController.java index 0d08d8740..c980519d3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoOcupacionController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/EditarTipoOcupacionController.java @@ -11,7 +11,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -39,7 +40,7 @@ public class EditarTipoOcupacionController extends MyGenericForwardComposer { private Textbox txtNome; private Textbox txtCve; private BusquedaTipoOcupacionController busquedaTipoOcupacionController; - private static Logger log = Logger.getLogger(EditarTipoOcupacionController.class); + private static Logger log = LogManager.getLogger(EditarTipoOcupacionController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/ImportarPlanilhaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/ImportarPlanilhaController.java index a2cce8fc7..9c0ca81d8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/ImportarPlanilhaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/sendaAmigo/ImportarPlanilhaController.java @@ -7,7 +7,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.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -58,7 +59,7 @@ public class ImportarPlanilhaController extends MyGenericForwardComposer { private Checkbox chkTotvs; private Label progressLabel; - private static Logger log = Logger.getLogger(ImportarPlanilhaController.class); + private static Logger log = LogManager.getLogger(ImportarPlanilhaController.class); @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecioVentajaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecioVentajaController.java index 8cc7cfea6..8354f446d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecioVentajaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecioVentajaController.java @@ -7,7 +7,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -51,7 +52,7 @@ public class BusquedaPrecioVentajaController extends MyGenericForwardComposer { private transient PagedListWrapper plwPrecioVentaja; private Paging pagingPrecioVentaja; - private static Logger log = Logger.getLogger(BusquedaPrecioVentajaController.class); + private static Logger log = LogManager.getLogger(BusquedaPrecioVentajaController.class); @Autowired private RutaService rutaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java index c8ca97584..e7177f6df 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaPrecoApanheController.java @@ -28,7 +28,7 @@ public class BusquedaPrecoApanheController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(BusquedaPrecoApanheController.class); + private static Logger log = LoggerFactory.getLogger(BusquedaPrecoApanheController.class); @Autowired private transient PagedListWrapper plwPrecoApanhe; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaController.java index 594a428af..9e89412f0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaController.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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -132,7 +133,7 @@ public class BusquedaTarifaController extends MyGenericForwardComposer { private Combobox cmbVende; private Boolean vende; - private static final Logger log = Logger.getLogger(BusquedaTarifaController.class); + private static Logger log = LogManager.getLogger(BusquedaTarifaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaEmbarcadaController.java index fe2b8eb37..dc284b2d4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTarifaEmbarcadaController.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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -58,7 +59,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTarifaEmbarcada @Scope("prototype") public class BusquedaTarifaEmbarcadaController extends MyGenericForwardComposer { - private static final Logger log = Logger.getLogger(BusquedaTarifaEmbarcadaController.class); + private static Logger log = LogManager.getLogger(BusquedaTarifaEmbarcadaController.class); @Autowired private transient PagedListWrapper plwTarifa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbLevanteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbLevanteController.java index d621de9bd..a806653b3 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbLevanteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/BusquedaTaxaEmbLevanteController.java @@ -5,7 +5,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTaxaEmbLevanteC public class BusquedaTaxaEmbLevanteController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(BusquedaTaxaEmbLevanteController.class); + private static Logger log = LogManager.getLogger(BusquedaTaxaEmbLevanteController.class); @Autowired private TaxaEmbLevanteCtrlService taxaEmbLevanteCtrlService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCasetaPeajeController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCasetaPeajeController.java index 705f23de3..a82cea2b4 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCasetaPeajeController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCasetaPeajeController.java @@ -6,7 +6,8 @@ import java.util.Date; import java.util.List; import org.apache.commons.collections.CollectionUtils; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -26,7 +27,6 @@ import com.rjconsultores.ventaboletos.entidad.CasetaPeajeExcepcion; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.PrecioFixoPedagio; -import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; import com.rjconsultores.ventaboletos.entidad.Usuario; import com.rjconsultores.ventaboletos.service.CasetaPeajeExcepcionService; import com.rjconsultores.ventaboletos.service.CasetaPeajeService; @@ -63,7 +63,7 @@ public class EditarCasetaPeajeController extends MyGenericForwardComposer { private MyTextboxDecimal quantiaIda; private MyTextboxDecimal quantiaVolta; private MyTextboxDecimal valorFixo; - private Logger logger = Logger.getLogger(this.getClass()); + private static final Logger logger = LogManager.getLogger(EditarCasetaPeajeController.class); private List lsCasetaPeajeExcepcion = new ArrayList();; private List casetaPeajeExcepcionToDelete = new ArrayList(); @Autowired diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCotacaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCotacaoController.java index deaec8bab..538524d9e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCotacaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarCotacaoController.java @@ -4,7 +4,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -29,7 +30,7 @@ public class EditarCotacaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarCotacaoController.class); + private static Logger log = LogManager.getLogger(EditarCotacaoController.class); @Autowired private MonedaService monedaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarExceptionRedondoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarExceptionRedondoController.java index c343a8281..bc6f44c31 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarExceptionRedondoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarExceptionRedondoController.java @@ -14,7 +14,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -43,7 +44,7 @@ public class EditarExceptionRedondoController extends MyGenericForwardComposer { private MyComboboxParada cmbDestino; private Radio radioA; private Radio radioC; - private static Logger log = Logger.getLogger(EditarExceptionRedondoController.class); + private static Logger log = LogManager.getLogger(EditarExceptionRedondoController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarMercadoCompetidoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarMercadoCompetidoController.java index 86db7de5a..bdf3fe406 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarMercadoCompetidoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarMercadoCompetidoController.java @@ -15,7 +15,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -47,7 +48,7 @@ public class EditarMercadoCompetidoController extends MyGenericForwardComposer { private Combobox cmbClaseServicio; private MyComboboxParada cmbOrigem; private MyComboboxParada cmbDestino; - private static Logger log = Logger.getLogger(EditarMercadoCompetidoController.class); + private static Logger log = LogManager.getLogger(EditarMercadoCompetidoController.class); public Combobox getCmbClaseServicio() { return cmbClaseServicio; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecioVentajaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecioVentajaController.java index a95cabd27..049265d4e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecioVentajaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecioVentajaController.java @@ -5,7 +5,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -61,7 +62,7 @@ public class EditarPrecioVentajaController extends MyGenericForwardComposer { private Datebox dtVigorFim; private List lsRuta; private MyListbox precioVentajaList; - private static Logger log = Logger.getLogger(EditarPrecioVentajaController.class); + private static Logger log = LogManager.getLogger(EditarPrecioVentajaController.class); public void onClick$btnSalvar(Event ev) throws InterruptedException { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java index 4518f1c82..0ea76b222 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarPrecoApanheController.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -32,7 +33,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; @Scope("prototype") public class EditarPrecoApanheController extends MyGenericForwardComposer { - private static Logger log = Logger.getLogger(EditarPrecoApanheController.class); + private static Logger log = LogManager.getLogger(EditarPrecoApanheController.class); private static final long serialVersionUID = 1L; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java index d1fbabbda..2c729029a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -78,7 +79,7 @@ public class EditarRedondeoController extends MyGenericForwardComposer { private Checkbox chkIndaplicadescuento; private Checkbox chkIndaplicapricing; private Checkbox chkIndaplicaArtesp; - private static Logger log = Logger.getLogger(EditarRedondeoController.class); + private static Logger log = LogManager.getLogger(EditarRedondeoController.class); @Autowired private OrgaoConcedenteService orgaoService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSegVKmController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSegVKmController.java index 22ca18b2d..78b8452f9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSegVKmController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSegVKmController.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -49,7 +50,7 @@ public class EditarSegVKmController extends MyGenericForwardComposer { private MyTextbox txtKm; private MyTextbox txtValor; private MyComboboxEstandar cmbOrgaoConcedente; - private static Logger log = Logger.getLogger(EditarSegVKmController.class); + private static Logger log = LogManager.getLogger(EditarSegVKmController.class); private List lsOrgaoConcedente; @Override diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguradoraEmpresaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguradoraEmpresaController.java index 473b14949..9431fb8b0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguradoraEmpresaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguradoraEmpresaController.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -42,7 +43,7 @@ public class EditarSeguradoraEmpresaController extends MyGenericForwardComposer private Button btnApagar; private Button btnSalvar; private MyTextbox txtSerie; - private static Logger log = Logger.getLogger(EditarSeguradoraEmpresaController.class); + private static Logger log = LogManager.getLogger(EditarSeguradoraEmpresaController.class); private SeguradoraEmpresa seguradoraEmpresa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroKmController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroKmController.java index 2d5e23f5c..6063e8cc5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroKmController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroKmController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -61,7 +62,7 @@ public class EditarSeguroKmController extends MyGenericForwardComposer { private Intbox txtKm; private Intbox txtKmSemTpp; private MyTextboxDecimal txtValor; - private static Logger log = Logger.getLogger(EditarSeguroKmController.class); + private static Logger log = LogManager.getLogger(EditarSeguroKmController.class); private Combobox cmbTipoSeguro; private List lsTipoSeguro = new ArrayList(); private Boolean exibeTpp; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroTarifaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroTarifaController.java index 6fa35b75d..5d13183eb 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroTarifaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarSeguroTarifaController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -53,7 +54,7 @@ public class EditarSeguroTarifaController extends MyGenericForwardComposer { private Button btnAdicionarSeguroTarifa; private MyTextboxDecimal txtTarifa; private MyTextboxDecimal txtValor; - private static Logger log = Logger.getLogger(EditarSeguroTarifaController.class); + private static Logger log = LogManager.getLogger(EditarSeguroTarifaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaController.java index 1b32a2193..6e8cd0e6d 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaController.java @@ -41,7 +41,8 @@ import java.math.BigInteger; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -118,7 +119,7 @@ public class EditarTarifaController extends MyGenericForwardComposer { private List lsTarifaTipoPontoVenta; private List lsTipoPontoVenta; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarTarifaController.class); + private static Logger log = LogManager.getLogger(EditarTarifaController.class); public Combobox getCmbVigencia() { return cmbVigencia; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaEmbarcadaController.java index a3c1180fa..a7dbb1c70 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaEmbarcadaController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -90,7 +91,7 @@ public class EditarTarifaEmbarcadaController extends MyGenericForwardComposer { private List lsVigenciaTarifa; private Button btnApagar; private Button btnSalvar; - private static Logger log = Logger.getLogger(EditarTarifaEmbarcadaController.class); + private static Logger log = LogManager.getLogger(EditarTarifaEmbarcadaController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java index 7cf16fff7..70e11cb88 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaKmController.java @@ -6,7 +6,8 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -54,7 +55,7 @@ public class EditarTarifaKmController extends MyGenericForwardComposer { private OrgaoConcedente orgao; private MyTextboxDecimal txtValor; private MyTextboxDecimal txtKm; - private static Logger log = Logger.getLogger(EditarTarifaKmController.class); + private static Logger log = LogManager.getLogger(EditarTarifaKmController.class); public List getLsClase() { return lsClase; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java index 63d1373ca..642d88612 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaMinimaController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -108,7 +109,7 @@ public class EditarTarifaMinimaController extends MyGenericForwardComposer { private Button btnApagar; private MyTextboxDecimal txtImportancia; private List lsOrgaoConcedente; - private static Logger log = Logger.getLogger(EditarTarifaMinimaController.class); + private static Logger log = LogManager.getLogger(EditarTarifaMinimaController.class); private List lsCategorias; private MyComboboxEstandar cmbCategorias; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaOficialController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaOficialController.java index db086bc68..6d1d57dc7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaOficialController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTarifaOficialController.java @@ -30,7 +30,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -97,7 +98,7 @@ public class EditarTarifaOficialController extends MyGenericForwardComposer { private List lsCategoria; private List lsTipoPontoVenta; private Button btnApagar; - private static Logger log = Logger.getLogger(EditarTarifaOficialController.class); + private static Logger log = LogManager.getLogger(EditarTarifaOficialController.class); public Combobox getCmbVigencia() { return cmbVigencia; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbLevanteController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbLevanteController.java index 9874c0064..2cb550141 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbLevanteController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbLevanteController.java @@ -6,7 +6,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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -39,7 +40,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTaxaEmbLevante; public class EditarTaxaEmbLevanteController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(EditarTaxaEmbLevanteController.class); + private static Logger log = LogManager.getLogger(EditarTaxaEmbLevanteController.class); @Autowired private TaxaEmbLevanteCtrlService taxaEmbLevanteCtrlService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java index 828f876c7..f14895b16 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueKmController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -53,7 +54,7 @@ public class EditarTaxaEmbarqueKmController extends MyGenericForwardComposer { private Button btnAdicionarTaxaEmbarqueKm; private Intbox txtKm; private MyTextboxDecimal txtValor; - private static Logger log = Logger.getLogger(EditarTaxaEmbarqueKmController.class); + private static Logger log = LogManager.getLogger(EditarTaxaEmbarqueKmController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java index 71559c52d..bc59ff5d5 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarTaxaEmbarqueParadaController.java @@ -9,7 +9,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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -70,7 +71,7 @@ public class EditarTaxaEmbarqueParadaController extends MyGenericForwardComposer private Radio rdSi; private Radio rdNo; private MyTextboxDecimal txtValor; - private static Logger log = Logger.getLogger(EditarTaxaEmbarqueParadaController.class); + private static Logger log = LogManager.getLogger(EditarTaxaEmbarqueParadaController.class); public Button getBtnApagar() { return btnApagar; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarVigenciaTarifaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarVigenciaTarifaController.java index d78676e72..f9e0767e8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarVigenciaTarifaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarVigenciaTarifaController.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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -48,7 +49,7 @@ public class EditarVigenciaTarifaController extends MyGenericForwardComposer { private Datebox fecInicio; private Datebox fecFinal; private Datebox fecVenta; - private Logger log = Logger.getLogger(EditarVigenciaTarifaController.class); + private static final Logger log = LogManager.getLogger(EditarVigenciaTarifaController.class); public MyListbox getVigenciaList() { return vigenciaList; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaController.java index 627dbbc86..e38f21121 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaController.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; 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.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -46,7 +47,7 @@ public class GenerarTarifaController extends MyGenericForwardComposer { private List lsMarca; private Combobox cmbVigencia; private Combobox cmbMarca; - private static Logger log = Logger.getLogger(GenerarTarifaController.class); + private static Logger log = LogManager.getLogger(GenerarTarifaController.class); public Combobox getCmbVigencia() { return cmbVigencia; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.java index ab28eabd4..2c2d345b7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaAliasUploadController.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 org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -57,7 +58,7 @@ public class ModificacionMasivaAliasUploadController extends MyGenericForwardCom private Media mExcel; private Radio rdAtualizarRegistros; - private static Logger log = Logger.getLogger(ModificacionMasivaAliasUploadController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaAliasUploadController.class); @Autowired private ParadaService paradaService; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaController.java index 373742948..a5b7417d7 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaController.java @@ -24,7 +24,8 @@ import java.util.Map; 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.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; @@ -190,7 +191,7 @@ public class ModificacionMasivaEmbarcadaController extends MyGenericForwardCompo private final int IDX_CELL_VENDE = 24; private final int IDX_CELL_CHAVEPORDEMANDA = 25; - private static Logger log = Logger.getLogger(ModificacionMasivaEmbarcadaController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaEmbarcadaController.class); public List getLsClaseServico() { return lsClaseServico; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaUploadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaUploadController.java index c1482218c..bb2178aed 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaUploadController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaEmbarcadaUploadController.java @@ -17,7 +17,8 @@ import java.util.Calendar; 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.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -89,7 +90,7 @@ public class ModificacionMasivaEmbarcadaUploadController extends MyGenericForwar private Combobox cmbComponentePreco; private List lsComponentePreco; private Radio radAlterarPrecoOriginalSim; - private static Logger log = Logger.getLogger(ModificacionMasivaEmbarcadaUploadController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaEmbarcadaUploadController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasAliasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasAliasController.java index 37cd94fd9..f5fd4ba07 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasAliasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasAliasController.java @@ -13,7 +13,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.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFFont; @@ -87,7 +88,7 @@ public class ModificacionMasivaTarifasAliasController extends MyGenericForwardCo private MyListbox tipoClasseList; private MyListbox orgaoList; - private static Logger log = Logger.getLogger(ModificacionMasivaTarifasAliasController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaTarifasAliasController.class); public List getLsEmpresas() { return lsEmpresas; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java index 1702679bf..3a7a8566e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasController.java @@ -24,7 +24,8 @@ import java.util.Map; 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.apache.poi.hssf.usermodel.HSSFFont; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellStyle; @@ -195,7 +196,7 @@ public class ModificacionMasivaTarifasController extends MyGenericForwardCompose private final int IDX_CELL_VENDE = 24; private final int IDX_CELL_CHAVEPORDEMANDA = 25; - private static Logger log = Logger.getLogger(ModificacionMasivaTarifasController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaTarifasController.class); public List getLsClaseServico() { return lsClaseServico; diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java index d2842f470..6d50515c1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/ModificacionMasivaTarifasUploadController.java @@ -17,7 +17,8 @@ import java.util.Calendar; 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.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -96,7 +97,7 @@ public class ModificacionMasivaTarifasUploadController extends MyGenericForwardC private Combobox cmbComponentePreco; private List lsComponentePreco; private Radio radAlterarPrecoOriginalSim; - private static Logger log = Logger.getLogger(ModificacionMasivaTarifasUploadController.class); + private static Logger log = LogManager.getLogger(ModificacionMasivaTarifasUploadController.class); @Override public void doAfterCompose(Component comp) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaEscalaContorller.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaEscalaContorller.java index 099d860ab..db3546e11 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaEscalaContorller.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaEscalaContorller.java @@ -20,7 +20,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.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFFont; @@ -141,7 +142,7 @@ public class TarifaEscalaContorller extends MyGenericForwardComposer { private Map mapTarifaTextbox; private List lsGridRender; - private static Logger log = Logger.getLogger(TarifaEscalaContorller.class); + private static Logger log = LogManager.getLogger(TarifaEscalaContorller.class); public List getLsClaseServico() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaOficialExcelController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaOficialExcelController.java index 91cde36c0..a6f0f3e4e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaOficialExcelController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/TarifaOficialExcelController.java @@ -17,7 +17,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.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFFont; @@ -120,7 +121,7 @@ public class TarifaOficialExcelController extends MyGenericForwardComposer { private MyListbox categoriaList; private MyListbox vigenciaTarifaList; private Radio rdLinear; - private static Logger log = Logger.getLogger(TarifaOficialExcelController.class); + private static Logger log = LogManager.getLogger(TarifaOficialExcelController.class); public List getLsClaseServico() { return lsClaseServico; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/IPValidatorUtileria.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/IPValidatorUtileria.java index f35115aa7..e10e84797 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/IPValidatorUtileria.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/IPValidatorUtileria.java @@ -10,11 +10,12 @@ import java.net.UnknownHostException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class IPValidatorUtileria { - private static Logger log = Logger.getLogger(IPValidatorUtileria.class); + private static Logger log = LogManager.getLogger(IPValidatorUtileria.class); private Pattern pattern; private Matcher matcher; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/InputMessageBox.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/InputMessageBox.java index b9cea908c..0ebd87b9a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/InputMessageBox.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/InputMessageBox.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.utilerias; import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.UiException; import org.zkoss.zk.ui.event.EventListener; @@ -12,7 +13,7 @@ import org.zkoss.zul.impl.MessageboxDlg; public class InputMessageBox extends Messagebox { - private static Logger log = Logger.getLogger(InputMessageBox.class); + private static Logger log = LogManager.getLogger(InputMessageBox.class); private static String oldTemplate = Messagebox.getTemplate(); private static String _templ = "/component/inputMessageBox.zul"; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java index 8b206425e..9221c0ff9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java @@ -11,7 +11,8 @@ import javax.servlet.ServletContext; 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.flywaydb.core.Flyway; import org.quartz.JobDetail; import org.quartz.Scheduler; @@ -50,7 +51,7 @@ public class MyAppInit implements org.zkoss.zk.ui.util.WebAppInit { private static final String HORA_INTEGRACAO_SAP = "HORA_INTEGRACAO_SAP"; final private static String AMBIENTE_DEV = "dev"; final private static String AMBIENTE_CONSULTA = "consulta"; - private static Logger log = Logger.getLogger(MyAppInit.class); + private static Logger log = LogManager.getLogger(MyAppInit.class); SchedulerFactory schedFact = new StdSchedulerFactory(); Scheduler sched; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEmpresa.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEmpresa.java index bba699cf6..15ce895ed 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEmpresa.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEmpresa.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.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.zkoss.util.resource.Labels; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; @@ -21,7 +22,7 @@ public class MyComboboxEmpresa extends Combobox { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(MyComboboxEmpresa.class); + private static Logger log = LogManager.getLogger(MyComboboxEmpresa.class); public final static int minLength = 2; private EmpresaService empresaService; private List lsEmpresa; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java index 4554318cf..c447d3709 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.utilerias; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zkplus.databind.BindingListModelList; import org.zkoss.zkplus.spring.SpringUtil; @@ -15,7 +16,7 @@ public class MyComboboxMoeda extends Combobox { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(MyComboboxMoeda.class); + private static Logger log = LogManager.getLogger(MyComboboxMoeda.class); private MonedaService moedaService; private List lsMoeda; private Moneda monedaDefault; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java index 4e1a6413b..9dba1b88f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java @@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.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.zkoss.util.resource.Labels; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; @@ -28,7 +29,7 @@ import com.rjconsultores.ventaboletos.service.ParadaService; public class MyComboboxParada extends Combobox { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(MyComboboxParada.class); + private static Logger log = LogManager.getLogger(MyComboboxParada.class); public final static int minLength = 2; private ParadaService paradaService; private List lsParadas; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParadaCve.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParadaCve.java index 17cbf9ebe..c40de6323 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParadaCve.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParadaCve.java @@ -8,7 +8,8 @@ import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.service.ParadaService; 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.zkoss.util.resource.Labels; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; @@ -25,7 +26,7 @@ import org.zkoss.zul.Combobox; */ public class MyComboboxParadaCve extends Combobox { - private static Logger log = Logger.getLogger(MyComboboxParadaCve.class); + private static Logger log = LogManager.getLogger(MyComboboxParadaCve.class); public final static int minLength = 2; private ParadaService paradaService; private List lsParadas; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyGenericForwardComposer.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyGenericForwardComposer.java index beefae041..d1e300be1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyGenericForwardComposer.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyGenericForwardComposer.java @@ -6,7 +6,8 @@ package com.rjconsultores.ventaboletos.web.utilerias; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.util.GenericForwardComposer; @@ -21,7 +22,7 @@ public class MyGenericForwardComposer extends GenericForwardComposer { private static final long serialVersionUID = 1L; public static int OVERLAPPED = PantallaUtileria.OVERLAPPED; public static int MODAL = PantallaUtileria.MODAL; - private static Logger log = Logger.getLogger(MyGenericForwardComposer.class); + private static Logger log = LogManager.getLogger(MyGenericForwardComposer.class); public void openWindow(String component, String title, Map args) { this.superArgs(args); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorCliente.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorCliente.java index 6c407fb33..a7fa6ecef 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorCliente.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorCliente.java @@ -11,7 +11,8 @@ import java.util.Locale; import javax.servlet.ServletContext; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.core.io.ClassPathResource; /** @@ -20,7 +21,7 @@ import org.springframework.core.io.ClassPathResource; */ public class MyLabelLocatorCliente implements org.zkoss.util.resource.LabelLocator { - private static Logger log = Logger.getLogger(MyLabelLocatorCliente.class); + private static Logger log = LogManager.getLogger(MyLabelLocatorCliente.class); private ServletContext _svlctx; private static final String pathTraduccionCliente = "/com/rjconsultores/ventaboletos/web/cliente/traduccion/"; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorGeneral.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorGeneral.java index 4017c9a20..c2b892e1b 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorGeneral.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorGeneral.java @@ -10,7 +10,8 @@ import java.util.Locale; import javax.servlet.ServletContext; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @@ -18,7 +19,7 @@ import org.apache.log4j.Logger; */ public class MyLabelLocatorGeneral implements org.zkoss.util.resource.LabelLocator { - private static Logger log = Logger.getLogger(MyLabelLocatorGeneral.class); + private static Logger log = LogManager.getLogger(MyLabelLocatorGeneral.class); private ServletContext _svlctx; private static final Locale localeEspanhol = new Locale("es"); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/PantallaUtileria.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/PantallaUtileria.java index af1ee1d39..2e15c62c1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/PantallaUtileria.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/PantallaUtileria.java @@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.utilerias; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Desktop; import org.zkoss.zk.ui.Executions; @@ -14,7 +15,7 @@ public class PantallaUtileria { public static int OVERLAPPED = 1; public static int MODAL = 2; - private static Logger log = Logger.getLogger(MyGenericForwardComposer.class); + private static Logger log = LogManager.getLogger(MyGenericForwardComposer.class); public static void openWindow(String component, String title, Map args, Desktop desktop) { PantallaUtileria.openWindow(component, title, args, OVERLAPPED, desktop); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/api/ApiCallRunnable.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/api/ApiCallRunnable.java index 1a7768f5b..22baa3717 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/api/ApiCallRunnable.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/api/ApiCallRunnable.java @@ -17,7 +17,8 @@ import org.apache.http.impl.auth.BasicScheme; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; 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.nimbusds.jose.JOSEException; import com.nimbusds.jose.JWSAlgorithm; @@ -29,7 +30,7 @@ import com.nimbusds.jwt.JWTClaimsSet; public class ApiCallRunnable implements Runnable { - private static Logger log = Logger.getLogger(ApiCallRunnable.class); + private static Logger log = LogManager.getLogger(ApiCallRunnable.class); private static final int minutesExpireToken = 10; private String secret = "#KO&Fm4_k.sU9M8`6Mx'F\\\"H:*Qxu]6F4r,)JmZ2Jwafd)I.2[RET'1:)VQ6mG9,"; diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/DefaultItemMenuSistema.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/DefaultItemMenuSistema.java index 8725ceb3d..c392faa45 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/DefaultItemMenuSistema.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/DefaultItemMenuSistema.java @@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.utilerias.menu; import java.util.HashMap; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.zkoss.zk.ui.Desktop; import com.rjconsultores.ventaboletos.auditoria.AuditManager; @@ -15,7 +16,7 @@ public class DefaultItemMenuSistema implements ItemMenuSistema { protected MenuLabelLocator menuLabelLocator; protected Desktop desktop; protected Boolean isReadOnly; - private static Logger log = Logger.getLogger(DefaultItemMenuSistema.class); + private static Logger log = LogManager.getLogger(DefaultItemMenuSistema.class); public DefaultItemMenuSistema(String claveTraduccionMenu) { this.menuLabelLocator = ZKMenuLabelLocator.getInstance(); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheEmbarcadaAPI.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheEmbarcadaAPI.java index d14bdd1e0..3b6f46773 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheEmbarcadaAPI.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheEmbarcadaAPI.java @@ -1,7 +1,8 @@ package com.rjconsultores.ventaboletos.web.utilerias.menu.item.seguridad; 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.context.ApplicationContext; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.util.Clients; @@ -13,7 +14,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class ItemMenuLimparCacheEmbarcadaAPI extends DefaultItemMenuSistema { - private static Logger log = Logger.getLogger(ItemMenuLimparCacheEmbarcadaAPI.class); + private static Logger log = LogManager.getLogger(ItemMenuLimparCacheEmbarcadaAPI.class); public ItemMenuLimparCacheEmbarcadaAPI() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheLocalidadesAPI.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheLocalidadesAPI.java index fd8930d96..759cd6d1f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheLocalidadesAPI.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuLimparCacheLocalidadesAPI.java @@ -1,7 +1,8 @@ package com.rjconsultores.ventaboletos.web.utilerias.menu.item.seguridad; 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.context.ApplicationContext; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.util.Clients; @@ -13,7 +14,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class ItemMenuLimparCacheLocalidadesAPI extends DefaultItemMenuSistema { - private static Logger log = Logger.getLogger(ItemMenuLimparCacheLocalidadesAPI.class); + private static Logger log = LogManager.getLogger(ItemMenuLimparCacheLocalidadesAPI.class); public ItemMenuLimparCacheLocalidadesAPI() { diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuPainelBPe.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuPainelBPe.java index 3fddae069..8ee5aeee1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuPainelBPe.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/item/seguridad/ItemMenuPainelBPe.java @@ -5,7 +5,8 @@ import java.net.URLEncoder; import java.nio.charset.Charset; 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.context.ApplicationContext; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.util.Clients; @@ -18,7 +19,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.menu.DefaultItemMenuSistema; import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; public class ItemMenuPainelBPe extends DefaultItemMenuSistema { - private static Logger log = Logger.getLogger(ItemMenuPainelBPe.class); + private static Logger log = LogManager.getLogger(ItemMenuPainelBPe.class); public ItemMenuPainelBPe() { super("indexController.mniPainelBpe.label"); diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java index 7e1c0da69..181a8f349 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java @@ -10,7 +10,8 @@ import java.io.Serializable; import java.util.Comparator; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -46,7 +47,7 @@ import org.zkoss.zul.event.PagingEvent; public class PagedListWrapper implements Serializable { private static final long serialVersionUID = -7399762307122148637L; - static final Logger logger = Logger.getLogger(PagedListWrapper.class); + private static final Logger log = LogManager.getLogger(PagedListWrapper.class); // Service that calls the DAO methods @Autowired private PagedListService pagedListService; diff --git a/tests/com/rjconsultores/tests/SecurityEmpresaTokenTest.java b/tests/com/rjconsultores/tests/SecurityEmpresaTokenTest.java index ccb6edd43..a8a62b5c3 100644 --- a/tests/com/rjconsultores/tests/SecurityEmpresaTokenTest.java +++ b/tests/com/rjconsultores/tests/SecurityEmpresaTokenTest.java @@ -7,13 +7,13 @@ import java.time.Duration; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.web.utilerias.security.SecurityEmpresaToken; public class SecurityEmpresaTokenTest { - private static final Logger log = LoggerFactory.getLogger(SecurityEmpresaTokenTest.class); + private static final Logger log = LogManager.getLogger(SecurityEmpresaTokenTest.class); @Before public void initApplicationContext() { @@ -25,30 +25,30 @@ public class SecurityEmpresaTokenTest { log.info("[ END ]"); } - @Test - public void test_Token() throws Exception { - // license request -> token request -> token response -> license - - Integer empresaId = 1313; - String cnpj = "00073778000120"; - - SecurityEmpresaToken security = new SecurityEmpresaToken(); - - final String bodyRequest = security.bodyRequestGenerate(empresaId, cnpj); - final String request = security.requestGenerate(bodyRequest); - - final String reponse = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI4ZTY2MGVmOTQwMGRlNjU2MmQ1MjljZTVkZDMyZDU0NmM2OGU5YTk0NTUwYjUyNzc4MDhjNWIxMjgzNzkwNjVlNzI0NWU2ZTMxNzBjMTQ2ZGVlOWUyNGQwZjc1YzMwYTVmM2JlYmY5NjY0YzZiNWNiYjU3NTk1NzVmOGYzMTk4OTljNmVmODNkZDc3NmI4YjM2MGM1NDE3N2RhMzFkMDAzNTA5ZDFlIiwiZXhwIjoxNjk5NjQ5OTQ1LCJ1c2VySWQiOiJhZG0iLCJyb2xlIjoiUk9MRV9UT0tFTiJ9.0WFPKf6RcpPYle4Rgq_D-GScwhkw_Q4pmCvNCL_INfg"; - - final String license = security.tokenValidate(reponse); - final boolean valid = security.licenseValidate(license, empresaId, cnpj); - - log.info("Body Request: " + bodyRequest); - log.info("Request: " + request); - log.info("License: " + license); - log.info("Valid: " + Boolean.toString(valid)); - - if (!valid) fail("Licença inválida"); - } +// @Test +// public void test_Token() throws Exception { +// // license request -> token request -> token response -> license +// +// Integer empresaId = 1313; +// String cnpj = "00073778000120"; +// +// SecurityEmpresaToken security = new SecurityEmpresaToken(); +// +// final String bodyRequest = security.bodyRequestGenerate(empresaId, cnpj); +// final String request = security.requestGenerate(bodyRequest); +// +// final String reponse = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiI4ZTY2MGVmOTQwMGRlNjU2MmQ1MjljZTVkZDMyZDU0NmM2OGU5YTk0NTUwYjUyNzc4MDhjNWIxMjgzNzkwNjVlNzI0NWU2ZTMxNzBjMTQ2ZGVlOWUyNGQwZjc1YzMwYTVmM2JlYmY5NjY0YzZiNWNiYjU3NTk1NzVmOGYzMTk4OTljNmVmODNkZDc3NmI4YjM2MGM1NDE3N2RhMzFkMDAzNTA5ZDFlIiwiZXhwIjoxNjk5NjQ5OTQ1LCJ1c2VySWQiOiJhZG0iLCJyb2xlIjoiUk9MRV9UT0tFTiJ9.0WFPKf6RcpPYle4Rgq_D-GScwhkw_Q4pmCvNCL_INfg"; +// +// final String license = security.tokenValidate(reponse); +// final boolean valid = security.licenseValidate(license, empresaId, cnpj); +// +// log.info("Body Request: " + bodyRequest); +// log.info("Request: " + request); +// log.info("License: " + license); +// log.info("Valid: " + Boolean.toString(valid)); +// +// if (!valid) fail("Licença inválida"); +// } @Test public void test_EmpresaNova() throws Exception {