diff --git a/pom.xml b/pom.xml index 4b629494d..ec0216043 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ 4.0.0 br.com.rjconsultores ventaboletosadm - 1.51.0 + 1.52.0 war - 1.38.0 - 1.28.0 + 1.39.0 + 1.29.0 UTF-8 UTF-8 @@ -83,37 +83,51 @@ br.com.rjconsultores IntegracaoReceitaDespesa - 1.4.0 + 1.5.0 br.com.rjconsultores WSTotvs - 1.2.0 + 1.3.0 + + + org.slf4j + slf4j-api + + br.com.rjconsultores WSAG - 1.2.0 + 1.3.0 br.com.rjconsultores ojdbc14 + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-reload4j + br.com.rjconsultores Auditador - 1.1.1 + 1.2.0 br.com.rjconsultores GeneradorBoletosCNAB - 1.6.1 + 1.7.0 diff --git a/src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java b/src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java index 557c1e544..f8aafc71d 100644 --- a/src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java +++ b/src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java @@ -13,8 +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; @@ -22,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 77d77708f..2d29d4940 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java @@ -5,8 +5,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; - +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; @@ -15,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 8ac94fc85..8e371abfa 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java @@ -11,8 +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; @@ -22,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/RelatorioAgenciaFechamentoNovo.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java index 57ff53a81..50c1f6318 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java @@ -9,8 +9,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.math.NumberUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +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 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioAgenciaFechamentoNovo extends Relatorio { - private static Logger log = LoggerFactory.getLogger(RelatorioAgenciaFechamentoNovo.class); + private static Logger log = LogManager.getLogger(RelatorioAgenciaFechamentoNovo.class); private 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 7f02abc6d..00ee02f11 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java @@ -9,8 +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; @@ -22,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 d98488615..473a64b07 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java @@ -8,8 +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; @@ -22,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 269c593e5..14f091b71 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java @@ -8,8 +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; @@ -22,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 eb9b4d9b1..447ff1133 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java @@ -11,8 +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; @@ -22,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 e5eed7b00..ab13260ca 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java @@ -16,8 +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; @@ -29,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 81c3e9169..bd19935a8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java @@ -7,8 +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 +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 d77378073..80e472a7a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java @@ -7,8 +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; @@ -21,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/RelatorioCarteirinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java index 9d821579f..58c95778c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java @@ -17,7 +17,8 @@ import javax.imageio.ImageIO; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.WordUtils; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.Cliente; import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; @@ -29,7 +30,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioCarteirinha extends Relatorio { - private static Logger log = org.slf4j.LoggerFactory.getLogger(RelatorioCarteirinha.class); + private static Logger log = LogManager.getLogger(RelatorioCarteirinha.class); public enum TipoLayout { LAYOUT_1, LAYOUT_2, LAYOUT_CLIENTE } diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java index c2c9ebbca..32cb30b5e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java @@ -9,7 +9,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java index db0b844c0..d7f64c1c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java @@ -8,8 +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; @@ -21,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 86d13496c..7e418c4cd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java @@ -12,8 +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; @@ -29,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 c0c40a736..68240b1f0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java @@ -11,8 +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; @@ -22,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/RelatorioDesempenhoPorLinha.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDesempenhoPorLinha.java index 5cd66c00b..d81885158 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDesempenhoPorLinha.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDesempenhoPorLinha.java @@ -14,7 +14,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; @@ -26,7 +27,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; public class RelatorioDesempenhoPorLinha extends Relatorio { - private static Logger log = Logger.getLogger(RelatorioDesempenhoPorLinha.class); + private static Logger log = LogManager.getLogger(RelatorioDesempenhoPorLinha.class); public RelatorioDesempenhoPorLinha(Map parametros, Connection conexao) throws Exception { super(parametros, conexao); diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java index 515911eba..fc3973715 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java @@ -10,8 +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; @@ -30,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 dd4e17b39..92c3b509d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java @@ -8,8 +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; @@ -23,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 ea061ac85..e168a44b9 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java @@ -8,8 +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; @@ -23,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/RelatorioEmpresaCorrida.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java index 3dabcc8d6..853d27357 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java @@ -9,8 +9,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +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; @@ -37,7 +37,7 @@ public class RelatorioEmpresaCorrida extends Relatorio { protected static final String FIELD_TURNO_ORIGEM = "turnoOrigem"; protected static final String FIELD_DATA_CORRIDA = "dataCorrida"; protected static final String FIELD_CORRIDA_ID = "corrida_id"; - protected Logger log = LoggerFactory.getLogger(RelatorioEmpresaCorrida.class); + protected Logger log = LogManager.getLogger(RelatorioEmpresaCorrida.class); public RelatorioEmpresaCorrida(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 1a2c43961..9d1e4451d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java @@ -10,8 +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; @@ -26,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 2212653b6..c6593abc0 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java @@ -11,8 +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; @@ -29,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 77cace931..e44c52aed 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java @@ -4,13 +4,12 @@ import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.Collections; 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; @@ -25,7 +24,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 ae3949b26..b0e9979ea 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java @@ -7,8 +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 +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 18b8ed3ba..83a386ea6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java @@ -9,8 +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; @@ -23,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/RelatorioImpressaoPosterior.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java index c40ca64b8..091202317 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java @@ -9,7 +9,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.slf4j.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 RelatorioImpressaoPosterior extends Relatorio { - private static Logger log = org.slf4j.LoggerFactory.getLogger(RelatorioImpressaoPosterior.class); + private static Logger log = LogManager.getLogger(RelatorioImpressaoPosterior.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java index ceffc9817..2f4a88b24 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java @@ -15,8 +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; @@ -33,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 5e3db4200..f857e9ffd 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java @@ -1,20 +1,16 @@ package com.rjconsultores.ventaboletos.relatorios.impl; -import java.lang.reflect.Array; import java.math.BigDecimal; import java.sql.Connection; import java.sql.ResultSet; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.Date; 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; @@ -32,7 +28,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 86a80a526..7bc8d0ba7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java @@ -5,7 +5,6 @@ import java.math.RoundingMode; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -13,9 +12,8 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; - -import org.zkoss.web.servlet.dsp.action.If; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.Corrida; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -33,7 +31,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 8091e646d..2abe4dae8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java @@ -5,7 +5,6 @@ import java.math.RoundingMode; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.Timestamp; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; @@ -13,9 +12,8 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; - -import org.zkoss.web.servlet.dsp.action.If; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.entidad.Corrida; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -33,7 +31,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 aa6f77eea..edc6e09d4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java @@ -11,11 +11,10 @@ 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; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioMensalDAERBean; @@ -26,7 +25,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 8bbfef875..add2450fa 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java @@ -6,8 +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; @@ -18,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 9e2bf15c4..06491ee6e 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java @@ -16,8 +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; @@ -30,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 5cbda4700..2f0742625 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java @@ -9,8 +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; @@ -21,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 742d234b1..2ab1468a6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java @@ -9,8 +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; @@ -21,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 a3f9926d9..46d2462d3 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java @@ -9,8 +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; @@ -21,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 7f2337df3..ef0df98db 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java @@ -7,8 +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 +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 d7881253a..f2e4b6fc4 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java @@ -13,8 +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; @@ -31,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 e72e9d0e3..e826ef5bb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java @@ -7,8 +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 +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 e71116010..910f76026 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java @@ -10,7 +10,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.zkoss.zul.Filedownload; import org.zkoss.zul.Listcell; @@ -57,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 9a063e08e..359ba948b 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java @@ -11,8 +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; @@ -24,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 590d467bf..a062e98f8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java @@ -11,8 +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 +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 2eef43c2c..6614e3369 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java @@ -11,12 +11,11 @@ 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; -import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioSegundaViaBean; import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioSegundaViaSeguroOpcionalBean; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; @@ -24,7 +23,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 d3650ce0e..759ccc9a8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java @@ -9,8 +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; @@ -33,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 abecb25c2..0e3280434 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java @@ -9,11 +9,9 @@ import java.util.ArrayList; import java.util.List; 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; @@ -25,9 +23,11 @@ import com.rjconsultores.ventaboletos.relatorios.utilitarios.pacote.PacoteTarifa import com.rjconsultores.ventaboletos.relatorios.utilitarios.pacote.PacoteVoucher; import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement; +import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; + 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 80d9f4495..596912e56 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java @@ -8,8 +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; @@ -25,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 d6410759e..af1fcba55 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java @@ -7,8 +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; @@ -24,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 caf7e9cf2..ac2bf4222 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java @@ -10,8 +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; @@ -25,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 9e4dfd3bd..348929ce6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java @@ -10,8 +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; @@ -25,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 5b847683e..0bb150a29 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java @@ -8,8 +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; @@ -20,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 138380697..a684f80eb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java @@ -10,8 +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; @@ -23,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 3afab4707..e7931097d 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java @@ -9,8 +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; @@ -24,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 76c180d74..1a2567fd7 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java @@ -10,8 +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; @@ -25,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 67b117c96..e711874c6 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java @@ -9,8 +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; @@ -22,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/RelatorioVendasParcelamento.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasParcelamento.java index edab4cf8d..8ef56b4d8 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasParcelamento.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasParcelamento.java @@ -9,7 +9,8 @@ import java.util.Date; import java.util.List; import java.util.Map; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.TipoEventoExtra; import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource; @@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; public class RelatorioVendasParcelamento extends Relatorio { - private static Logger log = org.slf4j.LoggerFactory.getLogger(RelatorioVendasParcelamento.class); + private static Logger log = LogManager.getLogger(RelatorioVendasParcelamento.class); private List lsDadosRelatorio; diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java index f47ea8772..b1ec3d0bb 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java @@ -7,8 +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 +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 692ab97b1..a9597844c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java @@ -6,8 +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; @@ -33,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 e6c502f74..b1ff5e25c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java @@ -8,8 +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; @@ -20,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 f2029fa54..725974c7c 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java @@ -6,10 +6,11 @@ package com.rjconsultores.ventaboletos.relatorios.utilitarios; import java.sql.ResultSet; import java.sql.SQLException; -import net.sf.jasperreports.engine.JRException; -import net.sf.jasperreports.engine.JRField; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import org.apache.log4j.Logger; +import net.sf.jasperreports.engine.JRException; +import net.sf.jasperreports.engine.JRField; /** @@ -18,7 +19,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 867ef0f67..38cf1919a 100644 --- a/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java +++ b/src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java @@ -5,8 +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; @@ -18,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/ConsultarOperador.java b/src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperador.java index b8c8c826f..71098899a 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperador.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperador.java @@ -7,7 +7,8 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.rest.bean.ParamsSincronizarOperador; import com.rjconsultores.ventaboletos.rest.service.ConsultarOperadorService; @@ -16,7 +17,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Path("/consultarOperadorProxy") public class ConsultarOperador { - private static Logger log = org.slf4j.LoggerFactory.getLogger(ConsultarOperador.class); + private static Logger log = LogManager.getLogger(ConsultarOperador.class); @POST @Consumes({ MediaType.APPLICATION_JSON }) diff --git a/src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperadorDetalhesCorrida.java b/src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperadorDetalhesCorrida.java index e2119fc6f..14a9a22c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperadorDetalhesCorrida.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperadorDetalhesCorrida.java @@ -7,7 +7,8 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.rest.bean.ParamsOperadorDetalhesCorrida; import com.rjconsultores.ventaboletos.rest.service.ConsultarOperadorDetalhesCorridaService; @@ -16,7 +17,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Path("/consultarOperadorDetalhesCorrida") public class ConsultarOperadorDetalhesCorrida { - private static Logger log = org.slf4j.LoggerFactory.getLogger(ConsultarOperadorDetalhesCorrida.class); + private static Logger log = LogManager.getLogger(ConsultarOperadorDetalhesCorrida.class); @POST @Consumes({ MediaType.APPLICATION_JSON }) diff --git a/src/java/com/rjconsultores/ventaboletos/rest/SincronizarOperador.java b/src/java/com/rjconsultores/ventaboletos/rest/SincronizarOperador.java index d8c7a9e3b..33d2e9d67 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/SincronizarOperador.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/SincronizarOperador.java @@ -8,7 +8,8 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.rest.bean.ParamsSincronizarOperador; import com.rjconsultores.ventaboletos.rest.service.SincronizarOperadorService; @@ -17,7 +18,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Path("/sincronizarOperador") public class SincronizarOperador { - private static Logger log = org.slf4j.LoggerFactory.getLogger(SincronizarOperador.class); + private static Logger log = LogManager.getLogger(SincronizarOperador.class); @POST @Consumes({ MediaType.APPLICATION_JSON }) diff --git a/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java b/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java index 847dae64f..3a090b3c0 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java @@ -8,18 +8,17 @@ 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; -import com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional.GerarConexionPorRutaController; 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/ValidaSenhaInstalacao.java b/src/java/com/rjconsultores/ventaboletos/rest/ValidaSenhaInstalacao.java index 823ad4ec1..006adac43 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/ValidaSenhaInstalacao.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/ValidaSenhaInstalacao.java @@ -8,14 +8,15 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.utilerias.PasswordHelper; @Path("/validaSenhaInstalacao") public class ValidaSenhaInstalacao { - private static Logger log = org.slf4j.LoggerFactory.getLogger(ValidaSenhaInstalacao.class); + private static Logger log = LogManager.getLogger(ValidaSenhaInstalacao.class); @GET @Produces({ MediaType.APPLICATION_JSON }) diff --git a/src/java/com/rjconsultores/ventaboletos/rest/pricing/AlteraPricingRS.java b/src/java/com/rjconsultores/ventaboletos/rest/pricing/AlteraPricingRS.java index da963bd47..dfa93a72d 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/pricing/AlteraPricingRS.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/pricing/AlteraPricingRS.java @@ -4,15 +4,12 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.enums.PricingOperacaoWS; @@ -28,7 +25,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; // FIXME: Este EndPoint foi movido para a RJ API public class AlteraPricingRS { - private static Logger log = org.slf4j.LoggerFactory.getLogger(AlteraPricingRS.class); + private static Logger log = LogManager.getLogger(AlteraPricingRS.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 ff758c9b0..1fa9af753 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java @@ -5,8 +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; @@ -32,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/ConsultarOperadorService.java b/src/java/com/rjconsultores/ventaboletos/rest/service/ConsultarOperadorService.java index 4cc9c1596..e6d8bb19c 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/service/ConsultarOperadorService.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/service/ConsultarOperadorService.java @@ -5,7 +5,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Service; import com.rjconsultores.routing.ReadOnlyConnection; @@ -23,7 +24,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Service("consultarOperadorService") public class ConsultarOperadorService { - private static Logger log = org.slf4j.LoggerFactory.getLogger(ConsultarOperadorService.class); + private static Logger log = LogManager.getLogger(ConsultarOperadorService.class); @ReadOnlyConnection public OperadorEmbarcadaVO buscarDadosOperador(ParamsSincronizarOperador params) { diff --git a/src/java/com/rjconsultores/ventaboletos/rest/service/SincronizarOperadorService.java b/src/java/com/rjconsultores/ventaboletos/rest/service/SincronizarOperadorService.java index 5b22980e8..e581783a0 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/service/SincronizarOperadorService.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/service/SincronizarOperadorService.java @@ -6,7 +6,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.slf4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.stereotype.Service; import com.rjconsultores.routing.ReadOnlyConnection; @@ -34,7 +35,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Service("sincronizarOperadorService") @SuppressWarnings("unchecked") public class SincronizarOperadorService { - private static Logger log = org.slf4j.LoggerFactory.getLogger(SincronizarOperadorService.class); + private static Logger log = LogManager.getLogger(SincronizarOperadorService.class); @ReadOnlyConnection public OperadorEmbarcadaVO buscarDadosOperador(ParamsSincronizarOperador params) throws Exception { diff --git a/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java b/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java index 8d775bec3..76753d7b2 100644 --- a/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java +++ b/src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java @@ -1,7 +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; @@ -18,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/cliente/conf/database.properties b/src/java/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties index efff4d709..946055520 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties +++ b/src/java/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties @@ -21,7 +21,7 @@ database.username=vtabol_sco database.password=vtax05 ################################################################################ #CONFIGURACAO HIBERNATE -database.showSql=false +database.showSql=true database.generateDdl=false database.dialect=org.hibernate.dialect.Oracle10gDialect database.driver=oracle.jdbc.OracleDriver 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 6ec672376..bf3208ca7 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,8 +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; @@ -16,7 +16,6 @@ import org.zkoss.zkplus.spring.SpringUtil; import org.zkoss.zul.Column; import org.zkoss.zul.Columns; import org.zkoss.zul.Combobox; -import org.zkoss.zul.Comboitem; import org.zkoss.zul.Grid; import org.zkoss.zul.Hbox; import org.zkoss.zul.Intbox; @@ -56,7 +55,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 69fe3357c..52205b220 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,8 +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; @@ -55,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 cd151d529..31a246092 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,8 +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; @@ -61,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 6f439f0d5..a292ad76a 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,8 +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; @@ -39,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 dc3c5619f..78b560707 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,8 +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; @@ -39,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 6c10d264d..75bbd2763 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; @@ -73,7 +74,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 de176348d..fa138f040 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 @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +30,7 @@ public class BusquedaHotelController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaHotelController.class); + private static Logger log = LogManager.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 a3f68e342..8af483fe8 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 @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +30,7 @@ public class BusquedaPacoteConvenioController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaPacoteConvenioController.class); + private static Logger log = LogManager.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 b7f45355b..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,8 +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; @@ -41,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 01ad81f9e..d3a2797fe 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 @@ -4,6 +4,21 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Messagebox; + import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Marca; import com.rjconsultores.ventaboletos.entidad.MarcaClaseServicio; @@ -14,19 +29,6 @@ import com.rjconsultores.ventaboletos.service.MarcaService; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Messagebox; /** * @@ -49,7 +51,7 @@ public class EditarAsociacionClaseServicioMarcaController extends MyGenericForwa private Combobox cmbMarca; private Combobox cmbClaseServicio; private Button btnApagar; - private static final 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 1e7be7455..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,8 +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; @@ -39,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 3a88ffa87..7e5bfff63 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,8 +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; @@ -52,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 0c028ac5f..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,8 +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; @@ -48,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 ecaa87705..10290a1f4 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,8 +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; @@ -26,7 +26,6 @@ import org.zkoss.zul.api.Comboitem; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.enums.TipoClasseServicoBPe; -import com.rjconsultores.ventaboletos.enums.TipoDescontoMonitrip; import com.rjconsultores.ventaboletos.service.ClaseServicioService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; @@ -44,7 +43,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 2dd0ec625..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,8 +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; @@ -48,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 f05094c67..32b42d221 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 @@ -6,12 +6,10 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; import java.util.Arrays; 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; @@ -51,7 +49,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 d2b2ab9ed..acba33f00 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,8 +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; @@ -45,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 51d12b187..7e7baaf94 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,8 +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; @@ -25,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 2c8b75964..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,8 +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; @@ -31,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 a6f5aa614..660f0f8f7 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 @@ -4,16 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import com.rjconsultores.ventaboletos.entidad.CuponConvenio; -import com.rjconsultores.ventaboletos.entidad.TipoConvenio; -import com.rjconsultores.ventaboletos.service.CuponConvenioService; -import com.rjconsultores.ventaboletos.service.TipoConvenioService; -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; @@ -25,6 +20,13 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Intbox; import org.zkoss.zul.Messagebox; +import com.rjconsultores.ventaboletos.entidad.CuponConvenio; +import com.rjconsultores.ventaboletos.entidad.TipoConvenio; +import com.rjconsultores.ventaboletos.service.CuponConvenioService; +import com.rjconsultores.ventaboletos.service.TipoConvenioService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Shiro @@ -43,7 +45,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 4a216fd9f..00e0e2eae 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,8 +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; @@ -32,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 4a2725636..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,8 +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; @@ -52,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 f0e4a3d2f..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,8 +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; @@ -53,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 cdd133e4f..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,8 +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; @@ -57,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 fefba21d0..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,8 +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; @@ -86,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 f4e076bc0..8ae4640bf 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,8 +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; @@ -15,15 +15,12 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Messagebox; import org.zkoss.zul.api.Datebox; -import com.rjconsultores.ventaboletos.entidad.Cliente; import com.rjconsultores.ventaboletos.entidad.Empleado; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.TipoEmpleado; import com.rjconsultores.ventaboletos.service.EmpleadoService; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.TipoEmpleadoService; -import com.rjconsultores.ventaboletos.service.impl.EmpleadoServiceImpl; -import com.rjconsultores.ventaboletos.service.impl.TipoEmpleadoServiceImpl; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @@ -32,7 +29,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 fa4407032..684534785 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; @@ -151,7 +152,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEmpresaInscrica 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 b8dde2295..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,8 +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; @@ -46,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 a2f9983b3..373d918c7 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,8 +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; @@ -48,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 0c8b332e9..b4a80881f 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,8 +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; @@ -16,7 +16,6 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Messagebox; -import com.rjconsultores.ventaboletos.entidad.Ciudad; import com.rjconsultores.ventaboletos.entidad.Escola; import com.rjconsultores.ventaboletos.service.EscolaService; import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; @@ -35,7 +34,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 855e32440..49f9bd090 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,8 +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; @@ -53,7 +53,8 @@ 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 08e4fec3c..4db8a25b7 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,8 +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; @@ -66,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 784eb2a3d..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,8 +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 +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 e4306783c..ce3713853 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 @@ -4,25 +4,27 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; + import com.rjconsultores.ventaboletos.entidad.GrupoRuta; import com.rjconsultores.ventaboletos.service.GrupoRutaService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; 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 java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.util.resource.Labels; -import org.zkoss.zul.Button; /** * * @author Administrador @@ -37,7 +39,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 d2ffd23d9..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,8 +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; @@ -26,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 b2647f2d3..94b336fad 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 @@ -10,13 +10,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.servlet.RequestDispatcher; -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; @@ -41,7 +36,6 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; -import com.rjconsultores.ventaboletos.web.utilerias.servlet.ImageServlet; import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext; @Controller("editarImagemController") @@ -60,7 +54,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 e81cfa995..50fe3e415 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 @@ -4,21 +4,12 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.service.EmpresaService; -import com.rjconsultores.ventaboletos.service.MarcaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -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; @@ -34,6 +25,17 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Image; import org.zkoss.zul.Row; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.MarcaService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; + /** * * @author Administrador @@ -54,7 +56,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 fb6bc56c0..b62cfabcc 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,9 +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.zkoss.zul.Textbox; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -16,6 +15,8 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; +import org.zkoss.zul.Textbox; + import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.MensagemRecusa; import com.rjconsultores.ventaboletos.exception.BusinessException; @@ -30,7 +31,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 1efbefd0d..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,8 +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; @@ -46,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 0bd3d305f..e6d95ff74 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,8 +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; @@ -86,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 7e3bac555..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,8 +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; @@ -42,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 56e5bfdf4..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,8 +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 +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 345fc18c0..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,8 +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; @@ -43,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 b909cc4a7..35867f2c2 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 @@ -4,16 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import com.rjconsultores.ventaboletos.entidad.Plaza; -import com.rjconsultores.ventaboletos.service.PlazaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -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 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; @@ -23,7 +18,13 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; -import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.Plaza; +import com.rjconsultores.ventaboletos.service.PlazaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; /** * @@ -39,7 +40,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 06ea68f79..9594579df 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 @@ -4,6 +4,22 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Messagebox; +import org.zkoss.zul.Radio; + import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.ProductoServicio; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -11,21 +27,6 @@ import com.rjconsultores.ventaboletos.service.ProductoServicioService; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Textarea; -import org.zkoss.zul.Button; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Messagebox; -import org.zkoss.zul.Radio; /** * @@ -47,7 +48,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 1ffcac814..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,8 +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; @@ -35,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 6d1e6cc7d..7aef3366f 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 @@ -4,6 +4,21 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Messagebox; + import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.PtovtaEmpresa; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; @@ -13,19 +28,6 @@ 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import java.util.Calendar; -import java.util.List; -import org.zkoss.util.resource.Labels; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Messagebox; /** * @@ -46,7 +48,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 488f24b03..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,8 +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; @@ -65,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 54363e8b0..06a584716 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,8 +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; @@ -211,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 25aaa1e34..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,8 +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; @@ -46,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 478728b7c..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,8 +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; @@ -39,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 2c707288b..2494e4dab 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 @@ -4,14 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import com.rjconsultores.ventaboletos.entidad.TipoConvenio; -import com.rjconsultores.ventaboletos.service.TipoConvenioService; -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; @@ -20,7 +16,12 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Messagebox; -import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.TipoConvenio; +import com.rjconsultores.ventaboletos.service.TipoConvenioService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; /** * @@ -35,7 +36,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 e7d1641f8..7097c9bf6 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 @@ -4,16 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import com.rjconsultores.ventaboletos.entidad.TipoCorte; -import com.rjconsultores.ventaboletos.service.TipoCorteService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -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 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; @@ -23,7 +18,13 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; -import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.TipoCorte; +import com.rjconsultores.ventaboletos.service.TipoCorteService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; /** * @@ -39,7 +40,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 32d32bb7b..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,8 +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; @@ -36,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 9f5bd9bf2..3d36dfbf9 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 @@ -4,24 +4,12 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import com.rjconsultores.ventaboletos.entidad.CategoriaTipoPtoVta; -import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.service.CategoriaService; -import com.rjconsultores.ventaboletos.service.CategoriaTipoPtoVtaService; -import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; -import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCategoriaTipoPtoVta; 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; @@ -35,6 +23,20 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Row; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.Categoria; +import com.rjconsultores.ventaboletos.entidad.CategoriaTipoPtoVta; +import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; +import com.rjconsultores.ventaboletos.service.CategoriaService; +import com.rjconsultores.ventaboletos.service.CategoriaTipoPtoVtaService; +import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCategoriaTipoPtoVta; + /** * * @author Administrador @@ -55,7 +57,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 b84365ba6..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,8 +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; @@ -35,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 5abcc1917..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,8 +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; @@ -38,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 f7a273466..443774d21 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 @@ -4,16 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import com.rjconsultores.ventaboletos.entidad.Turno; -import com.rjconsultores.ventaboletos.service.TurnoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -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 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; @@ -23,7 +18,13 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; -import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.Turno; +import com.rjconsultores.ventaboletos.service.TurnoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; /** * @@ -39,7 +40,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 d784b88a6..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,8 +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; @@ -30,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 f95e61527..4b4ad6693 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,8 +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; @@ -43,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/catalogos/VisualizarSenhaInstalacaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/VisualizarSenhaInstalacaoController.java index e8be50812..1a2f01974 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/VisualizarSenhaInstalacaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/VisualizarSenhaInstalacaoController.java @@ -1,6 +1,7 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos; -import org.jboss.logging.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; @@ -21,7 +22,7 @@ public class VisualizarSenhaInstalacaoController extends MyGenericForwardCompose private Textbox txtSenha; - private final Logger log = Logger.getLogger(VisualizarSenhaInstalacaoController.class); + private final Logger log = LogManager.getLogger(VisualizarSenhaInstalacaoController.class); @Override public void doAfterCompose(Component comp) throws Exception { 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 d5e8bc7b3..7cebb40ff 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 @@ -12,8 +12,8 @@ import java.util.Map; import javax.sql.DataSource; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +56,7 @@ import com.rjconsultores.wsag.GeradorTitulosAG; public class BusquedaCalculoComissaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaCalculoComissaoController.class); + private static Logger log = LogManager.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 6442ac2ea..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,8 +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; @@ -42,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 c19679a18..285e661f3 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 @@ -9,8 +9,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +37,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaHistoricoComissaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaHistoricoComissaoController.class); + private static Logger log = LogManager.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 3f6c6480b..1b7bb01fe 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 @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +30,7 @@ public class BusquedaItemDescontoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaItemDescontoController.class); + private static Logger log = LogManager.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 a0c325b5f..a14d813b3 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 @@ -7,8 +7,8 @@ import java.util.Date; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +40,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; public class BusquedaRetencaoDiariaComissaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaRetencaoDiariaComissaoController.class); + private static Logger log = LogManager.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 9a5a14227..ba7281e6a 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,8 +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; @@ -38,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 86acd4e58..e33bf300f 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,8 +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; @@ -76,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 74a828d29..872a32878 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,8 +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; @@ -29,7 +29,7 @@ public class EditarItemDescontoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static 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 98bf3e97c..ed3345e5c 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,8 +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; @@ -45,7 +45,7 @@ public class EditarLogConfenciaComissaoController extends MyGenericForwardCompos private static final long serialVersionUID = 1L; - private static 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 56ff84173..51ac14bea 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,7 +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; @@ -22,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 290aa0a5d..3753c8bb6 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,8 +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; @@ -54,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 fcaddb382..def571a59 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 @@ -4,29 +4,15 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; -import com.rjconsultores.ventaboletos.entidad.AlertaCtrl; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.Corrida; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.AlertaCtrlService; -import com.rjconsultores.ventaboletos.service.ClaseServicioService; -import com.rjconsultores.ventaboletos.service.CorridaService; -import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; import java.math.BigDecimal; import java.text.SimpleDateFormat; 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; @@ -49,6 +35,22 @@ import org.zkoss.zul.ListitemRenderer; import org.zkoss.zul.Radio; import org.zkoss.zul.Tab; +import com.rjconsultores.ventaboletos.entidad.AlertaCtrl; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.Corrida; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.AlertaCtrlService; +import com.rjconsultores.ventaboletos.service.ClaseServicioService; +import com.rjconsultores.ventaboletos.service.CorridaService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; + /** * * @author Administrador @@ -104,7 +106,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 439ffd3f2..70cb6e002 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 @@ -4,15 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; -import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; -import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; -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 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,6 +20,12 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; +import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -38,7 +40,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 7b69e97bb..5a4613221 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,8 +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; @@ -30,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 3563631ad..411806906 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,8 +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; @@ -67,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 dd3113799..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,8 +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; @@ -108,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 59d8e8eed..a4dca6850 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 @@ -4,6 +4,22 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Messagebox; + import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; import com.rjconsultores.ventaboletos.entidad.CategoriaPeriodo; import com.rjconsultores.ventaboletos.service.CategoriaDescuentoService; @@ -12,20 +28,6 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConfiguracionCategoriaPeriodo; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zul.Datebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Messagebox; /** * @@ -46,7 +48,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 da373500f..61dc5f7a7 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 @@ -4,6 +4,22 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; + import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.FormaPago; import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; @@ -15,20 +31,6 @@ 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 java.util.Calendar; -import java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; /** * @@ -55,7 +57,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 6d851bd07..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,8 +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; @@ -43,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 21068fd8c..0cf1e4401 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,8 +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; @@ -23,7 +23,6 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Radio; -import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.ItemAdicional; @@ -33,7 +32,6 @@ import com.rjconsultores.ventaboletos.entidad.PacoteItem; import com.rjconsultores.ventaboletos.entidad.PacoteTarifa; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.TipoTarifaPacote; -import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.ClaseServicioService; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.ItemAdicionalService; @@ -57,7 +55,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 055930069..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,8 +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; @@ -81,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 12ecc7f22..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,8 +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; @@ -129,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 095354579..a1381ca17 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 @@ -1,13 +1,13 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; -import java.util.Date; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; +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; @@ -59,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 cc3548684..110aff27e 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 @@ -4,7 +4,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; @@ -30,7 +31,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 5f617e1eb..ed94a0c70 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,8 +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; @@ -32,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 37a31d5dd..c3ea0a7ae 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,7 +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; @@ -23,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 e39120949..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,8 +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; @@ -46,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 2687f80b6..8a2aae8a9 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,8 +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; @@ -23,7 +23,6 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; -import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.constantes.ConstantesFuncionSistema; import com.rjconsultores.ventaboletos.entidad.MotivoCancelacion; import com.rjconsultores.ventaboletos.service.MotivoCancelacionService; @@ -45,7 +44,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 d7291817c..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,8 +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; @@ -39,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 bfc685114..402d525a7 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 @@ -4,19 +4,14 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; -import com.rjconsultores.ventaboletos.entidad.MotivoReimpresion; -import com.rjconsultores.ventaboletos.service.MotivoReimpresionService; -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 java.util.Calendar; +import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; -import java.util.Calendar; -import java.util.List; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; @@ -25,6 +20,12 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.MotivoReimpresion; +import com.rjconsultores.ventaboletos.service.MotivoReimpresionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Rafius @@ -37,7 +38,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 ce734d0bb..2a4b7ddcb 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,8 +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; @@ -34,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 d7584251a..42920dbbe 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 @@ -4,19 +4,15 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; -import com.rjconsultores.ventaboletos.entidad.PeriodoVacacional; -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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; import java.util.Calendar; import java.util.Date; import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; @@ -25,6 +21,12 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Datebox; import org.zkoss.zul.Messagebox; +import com.rjconsultores.ventaboletos.entidad.PeriodoVacacional; +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; + /** * * @author Rafius @@ -37,7 +39,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 268c8c414..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,8 +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; @@ -55,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 eea65969c..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,8 +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; @@ -109,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 a4c6d08e4..9c9b24c3b 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,8 +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; @@ -31,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 ede590c44..96a343758 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 @@ -4,6 +4,24 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Messagebox; + import com.rjconsultores.ventaboletos.entidad.Ciudad; import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.TipoCambioCiudad; @@ -16,22 +34,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxCiudad; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Messagebox; /** * @@ -61,7 +63,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 8d4eda8e9..bf42b5180 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,7 +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; @@ -23,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 71174477c..8491783b9 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 @@ -4,17 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales.cyberviaje; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.ProdClaseServicio; -import com.rjconsultores.ventaboletos.service.ClaseServicioService; -import com.rjconsultores.ventaboletos.service.ProdClaseServicioService; -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 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,6 +19,14 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.ProdClaseServicio; +import com.rjconsultores.ventaboletos.service.ClaseServicioService; +import com.rjconsultores.ventaboletos.service.ProdClaseServicioService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -42,7 +44,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 eac5364ff..f2d51c58b 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 @@ -4,17 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales.cyberviaje; -import com.rjconsultores.ventaboletos.entidad.FormaPago; -import com.rjconsultores.ventaboletos.entidad.ProdFormaPago; -import com.rjconsultores.ventaboletos.service.FormaPagoService; -import com.rjconsultores.ventaboletos.service.ProdFormaPagoService; -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 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,6 +19,14 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.FormaPago; +import com.rjconsultores.ventaboletos.entidad.ProdFormaPago; +import com.rjconsultores.ventaboletos.service.FormaPagoService; +import com.rjconsultores.ventaboletos.service.ProdFormaPagoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -42,7 +44,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 a35e5359f..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,8 +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; @@ -60,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 4e1acc545..fc70a9b2c 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 @@ -4,18 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales.cyberviaje; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.ProdMercado; -import com.rjconsultores.ventaboletos.entidad.ProductoServicio; -import com.rjconsultores.ventaboletos.service.ParadaService; -import com.rjconsultores.ventaboletos.service.ProdMercadoService; -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 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,6 +19,15 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.ProdMercado; +import com.rjconsultores.ventaboletos.entidad.ProductoServicio; +import com.rjconsultores.ventaboletos.service.ParadaService; +import com.rjconsultores.ventaboletos.service.ProdMercadoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -44,7 +46,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 34c3cad78..158ab09f0 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 @@ -4,6 +4,20 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales.cyberviaje; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; + import com.rjconsultores.ventaboletos.entidad.ProdPuntoVenta; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.service.ProdPuntoVentaService; @@ -12,18 +26,6 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; /** * @@ -42,7 +44,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 fc6f6e7be..47c408ba6 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 @@ -4,17 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales.cyberviaje; -import com.rjconsultores.ventaboletos.entidad.ProdRuta; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.service.ProdRutaService; -import com.rjconsultores.ventaboletos.service.RutaService; -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 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,6 +19,14 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.ProdRuta; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.service.ProdRutaService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -42,7 +44,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 1fa2e492d..69e658a9e 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 @@ -4,17 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales.cyberviaje; -import com.rjconsultores.ventaboletos.entidad.ProdTipoptovta; -import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.service.ProdTipoptovtaService; -import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; -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 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,6 +19,14 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.ProdTipoptovta; +import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; +import com.rjconsultores.ventaboletos.service.ProdTipoptovtaService; +import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -42,7 +44,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 29c9e0c30..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,8 +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; @@ -44,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 618cbcb32..cac5da5ef 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 @@ -1,5 +1,28 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.configuracioneccomerciales.cyberviaje; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.event.EventListener; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Radio; +import org.zkoss.zul.Textbox; + /* * To change this template, choose Tools | Templates * and open the template in the editor. @@ -29,27 +52,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCyberViajeProdP import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCyberViajeProdRuta; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCyberViajeProdTipoptovta; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCyberViajeProdVigencia; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.HashMap; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Radio; -import org.zkoss.zul.Textbox; /** * @@ -85,7 +87,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; @@ -463,7 +465,7 @@ public class EditarProductoServicioController extends MyGenericForwardComposer { try { Messagebox.show(Labels.getLabel("editarProductoServicioController.MSG.selectItem"), Labels.getLabel("editarProductoServicioController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarProductoServicioController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarProductoServicioController.class).log(Level.FATAL, "", ex); } } } @@ -702,7 +704,7 @@ public class EditarProductoServicioController extends MyGenericForwardComposer { try { Messagebox.show(Labels.getLabel("editarProductoServicioController.MSG.selectItem"), Labels.getLabel("editarProductoServicioController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarProductoServicioController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarProductoServicioController.class.getName()).log(Level.FATAL, "", ex); } } } 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 59d1d55b2..b2df7d717 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 @@ -4,6 +4,31 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.cortesias; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.util.Clients; +import org.zkoss.zkplus.databind.BindingListModel; +import org.zkoss.zkplus.databind.BindingListModelList; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Messagebox; +import org.zkoss.zul.Radio; +import org.zkoss.zul.Tab; +import org.zkoss.zul.Textbox; + import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Cortesia; import com.rjconsultores.ventaboletos.entidad.CortesiaBeneficiario; @@ -26,29 +51,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderCortesiaBeneficiario; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zkplus.databind.BindingListModel; -import org.zkoss.zkplus.databind.BindingListModelList; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Messagebox; -import org.zkoss.zul.Radio; -import org.zkoss.zul.Tab; -import org.zkoss.zul.Textbox; /** * @@ -121,7 +123,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 cb3004706..b47f60873 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 @@ -4,22 +4,12 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.cortesias; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.CortesiaDireccion; -import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.TipoCortesiaDescuento; -import com.rjconsultores.ventaboletos.service.ClaseServicioService; -import com.rjconsultores.ventaboletos.service.CortesiaDireccionService; -import com.rjconsultores.ventaboletos.service.MarcaService; -import com.rjconsultores.ventaboletos.service.TipoCortesiaDescuentoService; -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 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; @@ -33,6 +23,18 @@ import org.zkoss.zul.Datebox; import org.zkoss.zul.Intbox; import org.zkoss.zul.Messagebox; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.CortesiaDireccion; +import com.rjconsultores.ventaboletos.entidad.Marca; +import com.rjconsultores.ventaboletos.entidad.TipoCortesiaDescuento; +import com.rjconsultores.ventaboletos.service.ClaseServicioService; +import com.rjconsultores.ventaboletos.service.CortesiaDireccionService; +import com.rjconsultores.ventaboletos.service.MarcaService; +import com.rjconsultores.ventaboletos.service.TipoCortesiaDescuentoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Shiro @@ -61,7 +63,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 d6456b452..53400ac93 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 @@ -4,14 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.cortesias; -import com.rjconsultores.ventaboletos.entidad.GrupoCortesia; -import com.rjconsultores.ventaboletos.service.GrupoCortesiasService; -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; @@ -23,6 +20,11 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.GrupoCortesia; +import com.rjconsultores.ventaboletos.service.GrupoCortesiasService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Shiro @@ -36,7 +38,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 45230b4ff..a9927f727 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 @@ -4,17 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.cortesias; -import com.rjconsultores.ventaboletos.entidad.GrupoCortesia; -import com.rjconsultores.ventaboletos.entidad.TipoCortesia; -import com.rjconsultores.ventaboletos.service.GrupoCortesiasService; -import com.rjconsultores.ventaboletos.service.TipoCortesiaService; -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 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; @@ -27,6 +21,14 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.GrupoCortesia; +import com.rjconsultores.ventaboletos.entidad.TipoCortesia; +import com.rjconsultores.ventaboletos.service.GrupoCortesiasService; +import com.rjconsultores.ventaboletos.service.TipoCortesiaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Shiro @@ -44,7 +46,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 db5f2a668..3d2e12da7 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 @@ -4,20 +4,12 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.cortesias; -import com.rjconsultores.ventaboletos.entidad.TipoCortesia; -import com.rjconsultores.ventaboletos.entidad.TipoCortesiaDescuento; -import com.rjconsultores.ventaboletos.service.TipoCortesiaDescuentoService; -import com.rjconsultores.ventaboletos.service.TipoCortesiaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.ConstraintPorcentagem; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -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; @@ -29,7 +21,16 @@ import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; -import org.zkoss.zul.Textbox; + +import com.rjconsultores.ventaboletos.entidad.TipoCortesia; +import com.rjconsultores.ventaboletos.entidad.TipoCortesiaDescuento; +import com.rjconsultores.ventaboletos.service.TipoCortesiaDescuentoService; +import com.rjconsultores.ventaboletos.service.TipoCortesiaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.ConstraintPorcentagem; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; /** * @@ -50,7 +51,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 18a92ba2c..ca6956363 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 @@ -4,17 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.equivalencia; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.ClaseservicioEquivalencia; -import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; -import com.rjconsultores.ventaboletos.service.ClaseServicioService; -import com.rjconsultores.ventaboletos.service.ClaseservicioEquivalenciaService; -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; @@ -28,6 +21,15 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.ClaseservicioEquivalencia; +import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; +import com.rjconsultores.ventaboletos.service.ClaseServicioService; +import com.rjconsultores.ventaboletos.service.ClaseservicioEquivalenciaService; +import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -44,7 +46,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 b2d0c0023..7c0f64fda 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 @@ -4,18 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.equivalencia; -import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.EmpresaEquivalencia; -import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; -import com.rjconsultores.ventaboletos.service.EmpresaEquivalenciaService; -import com.rjconsultores.ventaboletos.service.EmpresaService; -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; @@ -29,6 +21,16 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.EmpresaEquivalencia; +import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; +import com.rjconsultores.ventaboletos.service.EmpresaEquivalenciaService; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -45,7 +47,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 cf8c174e8..1de8af88b 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 @@ -4,17 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.equivalencia; -import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; -import com.rjconsultores.ventaboletos.entidad.MotivoCancelacion; -import com.rjconsultores.ventaboletos.entidad.MotivocancelacionEquivalencia; -import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; -import com.rjconsultores.ventaboletos.service.MotivoCancelacionService; -import com.rjconsultores.ventaboletos.service.MotivocancelacionEquivalenciaService; -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; @@ -27,6 +20,15 @@ import org.zkoss.zul.Combobox; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; +import com.rjconsultores.ventaboletos.entidad.MotivoCancelacion; +import com.rjconsultores.ventaboletos.entidad.MotivocancelacionEquivalencia; +import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; +import com.rjconsultores.ventaboletos.service.MotivoCancelacionService; +import com.rjconsultores.ventaboletos.service.MotivocancelacionEquivalenciaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Rafius @@ -43,7 +45,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 ad606d779..344ecf62c 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 @@ -4,16 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.equivalencia; -import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.ParadaEquivalencia; -import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; -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; @@ -27,6 +21,14 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.ComisionistaExterno; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.ParadaEquivalencia; +import com.rjconsultores.ventaboletos.service.ComisionistaExternoService; +import com.rjconsultores.ventaboletos.service.ParadaEquivalenciaService; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -41,7 +43,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 aac31b42b..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,8 +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; @@ -94,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 6bd8dcbae..e438b60e9 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,8 +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; @@ -42,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 dc0b21927..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,8 +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; @@ -69,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 589fb7425..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,8 +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; @@ -197,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 baaa316ef..0e3594f6b 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,8 +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; @@ -52,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 1fe508d58..7b898edad 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,8 +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; @@ -30,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 54ae5fb59..eb7df8f75 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,8 +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; @@ -73,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 fba02f559..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,8 +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; @@ -223,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 0ed935e06..d5d291c3a 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; @@ -114,7 +115,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 3faee3728..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,8 +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; @@ -32,7 +32,7 @@ public class EditarDataEdicaoCorridaController extends MyGenericForwardComposer private Button btnApagar; private Datebox fecInicio; private Datebox fecFinal; - private static final 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 0fd263571..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,8 +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; @@ -241,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 69ee1ea0e..46d99fe95 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,8 +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; @@ -31,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 63acaa218..f29bb5a48 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,8 +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; @@ -25,7 +25,6 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.WrongValueException; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import org.zkoss.zk.ui.event.InputEvent; import org.zkoss.zkplus.databind.BindingListModelList; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; @@ -45,7 +44,6 @@ import com.rjconsultores.ventaboletos.entidad.EsquemaOperacional; import com.rjconsultores.ventaboletos.entidad.EsquemaTramo; import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.ParadaEsquema; -import com.rjconsultores.ventaboletos.entidad.RolOperativo; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; import com.rjconsultores.ventaboletos.entidad.Tramo; @@ -75,7 +73,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 3b94a7c31..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,8 +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; @@ -34,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 30d368b88..7df368693 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 @@ -5,12 +5,11 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; import java.util.Calendar; -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; @@ -51,7 +50,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 da6088dd8..fd07364fd 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,8 +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; @@ -59,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 af0af39cb..265b2e5f2 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 @@ -4,17 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; -import com.rjconsultores.ventaboletos.entidad.TipoParada; -import com.rjconsultores.ventaboletos.service.TipoParadaService; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -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; @@ -28,6 +22,13 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Row; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.TipoParada; +import com.rjconsultores.ventaboletos.service.TipoParadaService; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -41,7 +42,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 a70582a0e..e97680e61 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,8 +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; @@ -34,7 +34,6 @@ import com.rjconsultores.ventaboletos.service.ClaseServicioService; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.TramoKmServicioService; import com.rjconsultores.ventaboletos.service.TramoService; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; @@ -59,7 +58,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 a97fec828..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,8 +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; @@ -80,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 b875163c5..66454a96b 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 @@ -4,16 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.esquemaoperacional; -import com.rjconsultores.ventaboletos.entidad.Via; -import com.rjconsultores.ventaboletos.service.ViaService; -import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; -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 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,6 +21,13 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.Via; +import com.rjconsultores.ventaboletos.service.ViaService; +import com.rjconsultores.ventaboletos.utilerias.RegistroConDependenciaException; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -40,7 +42,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 45934c4c3..4e54d59fb 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,8 +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; @@ -41,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 2eb53be0e..d264c448a 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/SelecionarServicosGerarController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/SelecionarServicosGerarController.java index 383f060bf..a53b2d8cf 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/SelecionarServicosGerarController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/esquemaoperacional/SelecionarServicosGerarController.java @@ -10,8 +10,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +53,7 @@ import com.trg.search.Filter; public class SelecionarServicosGerarController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(SelecionarServicosGerarController.class); + private static Logger log = LogManager.getLogger(SelecionarServicosGerarController.class); @Autowired private transient PagedListWrapper plwEsquemaCorrida; 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 57e288a2d..9035a4108 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,8 +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; @@ -46,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 0bdc41116..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,8 +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; @@ -67,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 dd5313541..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,8 +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 +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 230514dd2..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,8 +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 +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 1e72e1e1a..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,8 +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; @@ -38,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 ca3025ebd..96c47d4e9 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 @@ -6,11 +6,11 @@ import java.util.Calendar; import java.util.HashMap; import java.util.List; 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.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -121,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 @@ -1354,7 +1354,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.windowVigencia.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -1544,7 +1544,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -1614,7 +1614,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -1683,7 +1683,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -1750,7 +1750,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -1817,7 +1817,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -1897,7 +1897,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -1962,7 +1962,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -2030,7 +2030,7 @@ public class EditarGP_PricingController extends PricingController { Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -2094,7 +2094,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -2192,7 +2192,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -2261,7 +2261,7 @@ public class EditarGP_PricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } @@ -2386,7 +2386,7 @@ public class EditarGP_PricingController extends PricingController { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarGP_PricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarGP_PricingController.class).log(Level.FATAL, "", ex); } } } 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 5d2a0230c..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,8 +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; @@ -57,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 fa309b981..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,8 +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; @@ -31,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 19749a0f8..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,8 +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; @@ -71,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 b5d15bacc..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,8 +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; @@ -32,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 7b5729f2d..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,8 +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; @@ -26,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 ae2a6a843..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,8 +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; @@ -41,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 f67e2b1a9..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,8 +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 +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 5791b6173..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,8 +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 +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 f1796471d..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,8 +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; @@ -71,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 be15a02bc..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,8 +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; @@ -39,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 c26eda3f0..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,8 +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; @@ -35,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 6756733c9..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,8 +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; @@ -39,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 0c7b7078e..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,8 +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 +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 6a204d1cc..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,8 +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; @@ -38,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 e3f4cc2be..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,8 +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; @@ -31,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 ecba895bd..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,8 +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; @@ -104,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 98edb96e5..3fd0696f0 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,8 +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; @@ -116,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 2f95c474e..7ff0ec45d 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 @@ -7,10 +7,8 @@ import java.text.SimpleDateFormat; import java.util.Date; 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; @@ -35,7 +33,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 86b00a0e9..658c01b75 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,8 +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; @@ -59,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 a6c1e473b..f81a43eaf 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,8 +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; @@ -48,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 612913f74..79fefad8c 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,8 +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; @@ -48,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 2ad1e8089..108afc75c 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,8 +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 +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 b83f3ac32..096271b60 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,8 +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; @@ -45,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 0f2e030d0..1682a8a94 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 @@ -1,11 +1,10 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.impressaofiscal; 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; @@ -63,7 +62,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 b42a12458..f025e8fba 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,8 +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; @@ -55,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 8649ed0a4..bbc07abf3 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,8 +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; @@ -66,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 869ed913a..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,8 +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; @@ -59,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 c478c39e5..cbf9d8acd 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 @@ -10,12 +10,11 @@ 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; -import org.zkforge.ckez.CKeditor; import org.zkoss.util.resource.Labels; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.Executions; @@ -32,7 +31,6 @@ import org.zkoss.zul.Textbox; import com.rjconsultores.ventaboletos.constantes.Constantes; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.FormaPago; -import com.rjconsultores.ventaboletos.entidad.FormaPagoDet; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; import com.rjconsultores.ventaboletos.entidad.TipoEventoExtra; import com.rjconsultores.ventaboletos.entidad.TipoEventoExtraEmpresa; @@ -107,7 +105,7 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer { - 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 80cd53ed7..5337508ee 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,7 +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; @@ -16,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 b9a4a939f..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,8 +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; @@ -20,7 +20,7 @@ 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 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 7410cd1e0..32e4d0257 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,8 +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; @@ -20,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); 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 deb85ca44..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,7 +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; @@ -12,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 72557aea5..0893d3a92 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 @@ -1,15 +1,11 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.job; -import java.sql.Connection; -import java.sql.SQLException; import java.util.Calendar; import java.util.List; 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; @@ -22,7 +18,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 1b46ee583..c6de1b196 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 @@ -4,8 +4,8 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +31,7 @@ public class BusquedaManutencaoPacoteController extends MyGenericForwardComposer private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaManutencaoPacoteController.class); + private static Logger log = LogManager.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 b75ba1cb7..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,8 +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; @@ -35,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 9d0b2c55c..f0a0344d9 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,8 +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; @@ -16,7 +16,6 @@ import org.zkoss.zk.ui.event.Event; import com.rjconsultores.ventaboletos.entidad.CorridaTramo; import com.rjconsultores.ventaboletos.service.CorridaTramoService; import com.rjconsultores.ventaboletos.service.TarjetaViajeService; -import com.rjconsultores.ventaboletos.web.gui.controladores.catalogos.EditarCiudadController; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @Controller("actualizaTarjetaViajeController") @@ -27,7 +26,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 e53aef820..356da2022 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,8 +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; @@ -29,7 +29,6 @@ import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Conductor; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.TarjetaViaje; import com.rjconsultores.ventaboletos.service.AutobusService; import com.rjconsultores.ventaboletos.service.ClaseServicioService; @@ -50,7 +49,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 99abbeee7..6864aa672 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,8 +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; @@ -29,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 1e9c57658..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,8 +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 +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 3c739af34..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,8 +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; @@ -44,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 7b99393fc..0bc43e552 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 @@ -4,6 +4,21 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; + import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.PricingCategoria; @@ -12,19 +27,6 @@ import com.rjconsultores.ventaboletos.service.PricingCategoriaService; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import java.util.List; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Combobox; /** * @@ -42,7 +44,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 1a6e4bdb9..f3902c277 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 @@ -4,6 +4,21 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; + import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.PricingClase; @@ -12,19 +27,6 @@ import com.rjconsultores.ventaboletos.service.PricingClaseService; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import java.util.List; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Combobox; /** * @@ -42,7 +44,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 f17013ccc..950714dc0 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 @@ -10,10 +10,10 @@ import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.logging.Level; - -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; @@ -86,7 +86,6 @@ import com.rjconsultores.ventaboletos.vo.parada.ParadaVOConexionRuta; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderConexaoPricing; -import com.rjconsultores.ventaboletos.web.utilerias.render.RenderGeracaoConexionPorRuta; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingAsiento; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingCategoria; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingClase; @@ -113,7 +112,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; @@ -1234,7 +1233,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.windowVigencia.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1427,7 +1426,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1498,7 +1497,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1568,7 +1567,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1636,7 +1635,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1704,7 +1703,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1779,7 +1778,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1848,7 +1847,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1918,7 +1917,7 @@ public class EditarPricingController extends PricingController { Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -1983,7 +1982,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -2065,7 +2064,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -2135,7 +2134,7 @@ public class EditarPricingController extends PricingController { try { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } @@ -2263,7 +2262,7 @@ public class EditarPricingController extends PricingController { Messagebox.show(Labels.getLabel("editarPricingController.MSG.selectItem"), Labels.getLabel("editarPricingController.window.title"), Messagebox.OK, Messagebox.EXCLAMATION); } catch (InterruptedException ex) { - java.util.logging.Logger.getLogger(EditarPricingController.class.getName()).log(Level.SEVERE, null, ex); + LogManager.getLogger(EditarPricingController.class).log(Level.FATAL, "", ex); } } } 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 3bec7bd56..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,8 +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; @@ -65,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 1125edb7b..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,8 +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; @@ -26,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 dcb345dda..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,8 +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; @@ -39,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 487bbe3ae..65baad756 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,9 +13,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.log4j.Logger; - -import org.hibernate.Hibernate; +import org.apache.logging.log4j.LogManager; +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 +61,6 @@ import com.rjconsultores.ventaboletos.utilerias.CustomEnum; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingAgencia; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderPricingCanal; @@ -79,7 +77,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 3e9fc5f2b..69d466b68 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,8 +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; @@ -32,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 a7f600549..897bad43b 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,8 +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; @@ -15,7 +15,6 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Radio; import com.rjconsultores.ventaboletos.entidad.FormaPago; -import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.PricingFormapago; import com.rjconsultores.ventaboletos.service.FormaPagoService; import com.rjconsultores.ventaboletos.service.PricingFormapagoService; @@ -27,7 +26,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 ca0588305..bc39cca70 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 @@ -4,6 +4,22 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.util.Clients; +import org.zkoss.zul.Combobox; + import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.PricingImporte; @@ -13,20 +29,6 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import java.util.List; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zul.Combobox; /** * @@ -47,7 +49,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 dc4120330..c246cd644 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 @@ -4,6 +4,21 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; + import com.rjconsultores.ventaboletos.entidad.Marca; import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.PricingMarca; @@ -12,19 +27,6 @@ import com.rjconsultores.ventaboletos.service.PricingMarcaService; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import java.util.List; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Combobox; /** * @@ -43,7 +45,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 d16bd909e..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,8 +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; @@ -47,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 9e950574e..1d6239ac2 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,8 +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; @@ -60,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 92e870792..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,8 +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; @@ -35,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 be45480b4..de5579d13 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 @@ -4,17 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; -import com.rjconsultores.ventaboletos.entidad.Pricing; -import com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.PricingPuntoVentaService; -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 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,6 +18,15 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.Pricing; +import com.rjconsultores.ventaboletos.entidad.PricingPuntoVenta; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.PricingPuntoVentaService; +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; + /** * * @author Rafius @@ -41,7 +43,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 0f0d9ab91..dd77fc550 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 @@ -4,22 +4,15 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; -import com.rjconsultores.ventaboletos.entidad.Pricing; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.PricingRuta; -import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.service.PricingRutaService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -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 java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; -import java.util.List; import org.zkoss.util.resource.Labels; import org.zkoss.zhtml.Messagebox; import org.zkoss.zk.ui.Component; @@ -27,6 +20,15 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.Pricing; +import com.rjconsultores.ventaboletos.entidad.PricingRuta; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.service.PricingRutaService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Rafius @@ -44,7 +46,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 679009ae0..a5f9d8167 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 @@ -4,6 +4,21 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.pricing; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Combobox; + import com.rjconsultores.ventaboletos.entidad.Pricing; import com.rjconsultores.ventaboletos.entidad.PricingTipoPtoVta; import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; @@ -12,19 +27,6 @@ import com.rjconsultores.ventaboletos.service.TipoPuntoVentaService; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import java.util.List; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Combobox; /** * @@ -43,7 +45,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 4368920a5..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,8 +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 +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 ae6ef94d8..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,8 +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; @@ -39,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 49169081f..097e992a3 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 @@ -11,13 +11,12 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; -import java.util.Date; 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; @@ -91,7 +90,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 b6b8677b5..4fafa29ec 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,8 +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; @@ -65,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 258523ea2..1579b1df9 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,8 +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; @@ -47,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 280ca71ca..4a8831527 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,8 +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; @@ -23,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 e58413d80..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,8 +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; @@ -53,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 b69ea8b5d..64d321b78 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 @@ -15,7 +15,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; @@ -56,7 +57,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 105cae83c..03c693b5e 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,8 +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; @@ -38,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 08c8d66be..999ef1c9f 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,8 +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; @@ -45,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 dab1f21df..0752e344a 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,8 +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 +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 92298a4f1..8eca88c3f 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,8 +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; @@ -23,7 +23,6 @@ import org.zkoss.zul.Datebox; import com.rjconsultores.ventaboletos.entidad.Articulo; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.entidad.TipoVenta; import com.rjconsultores.ventaboletos.relatorios.impl.RelatorioConferenciaFormularioFisico; import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio; import com.rjconsultores.ventaboletos.service.ArticuloService; @@ -37,7 +36,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 615cc0f3b..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,8 +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; @@ -36,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 a61397ef9..c386569a6 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,8 +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; @@ -38,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 de4f49772..7f09ac7e7 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,8 +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; @@ -23,11 +23,11 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; import org.zkoss.zkplus.databind.BindingListModel; import org.zkoss.zkplus.databind.BindingListModelList; +import org.zkoss.zul.Checkbox; import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Radio; import org.zkoss.zul.Timebox; -import org.zkoss.zul.Checkbox; import com.rjconsultores.ventaboletos.dao.ConstanteDAO; import com.rjconsultores.ventaboletos.entidad.Empresa; @@ -56,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/RelatorioDesempenhoPorLinhaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDesempenhoPorLinhaController.java index d18307ff3..2a4fa9294 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDesempenhoPorLinhaController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioDesempenhoPorLinhaController.java @@ -12,7 +12,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; @@ -49,7 +50,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderDesempenhoPorLi public class RelatorioDesempenhoPorLinhaController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = Logger.getLogger(RelatorioDesempenhoPorLinhaController.class); + private static Logger log = LogManager.getLogger(RelatorioDesempenhoPorLinhaController.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 a35e6af35..cdc07679e 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,8 +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; @@ -71,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 b3b0365f1..68797b780 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,8 +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; @@ -32,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 2a746800b..d955fd056 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,8 +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; @@ -39,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 2e4da275d..81605d5d8 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,8 +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; @@ -74,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 3c733290e..0cbae9405 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,8 +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 +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 55e514a88..41db97757 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,8 +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; @@ -30,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 1ff36905c..71ca7f0eb 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,8 +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; @@ -41,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 b477f826d..a51a9a512 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,8 +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; @@ -45,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 b84bcd75d..55640f76b 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,8 +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; @@ -50,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 222608735..bdee1f0af 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,8 +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; @@ -38,8 +38,8 @@ import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.EmpresaEmailConfigService; import com.rjconsultores.ventaboletos.utilerias.DateUtil; import com.rjconsultores.ventaboletos.utilerias.SendMail; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.utilerias.SendMail.AuthType; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.vo.comissao.EmailConfigVO; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; @@ -49,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 11f809316..111c349a2 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,8 +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; @@ -41,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 b97ba328d..e60f7ce28 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 @@ -9,8 +9,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +38,7 @@ public class RelatorioMovimentosAtrasoController extends MyGenericForwardCompose private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(RelatorioMovimentosAtrasoController.class); + private static Logger log = LogManager.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 7a9fb095f..88699b145 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 @@ -5,8 +5,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +29,7 @@ public class RelatorioObservacaoBilhetesController extends MyGenericForwardCompo private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(RelatorioObservacaoBilhetesController.class); + private static Logger log = LogManager.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 9839f4cba..e4c9a1ea5 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 @@ -5,8 +5,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +33,7 @@ public class RelatorioObservacaoConferenciaMovimentoController extends MyGeneric private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(RelatorioObservacaoConferenciaMovimentoController.class); + private static Logger log = LogManager.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 48d6a80a0..6b5bf0c0a 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 @@ -5,8 +5,8 @@ import java.util.Map; import javax.sql.DataSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +29,7 @@ public class RelatorioObservacaoEventosFinaneirosController extends MyGenericFor private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(RelatorioObservacaoEventosFinaneirosController.class); + private static Logger log = LogManager.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 3cc924ce1..698c6062d 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,8 +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; @@ -69,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 5db49c8fc..58488e698 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,8 +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 +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 ebd2b8b85..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,8 +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; @@ -115,7 +115,7 @@ public class RelatorioReceitaDiariaAgenciaController extends MyGenericForwardCom private Radio radDataFechamento; private MyListbox puntoVentaConfiguracaoList; private Paging pagingPuntoVentaConfiguracao; - private static final Logger log = Logger.getLogger(RelatorioReceitaDiariaAgenciaController.class); + private static final Logger log = LogManager.getLogger(RelatorioReceitaDiariaAgenciaController.class); public Checkbox getSomenteCancelados() { return somenteCancelados; } 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 dbaec55e8..da7dec39e 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 @@ -2,19 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.relatorios; import java.util.List; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.PuntoVenta; -import com.rjconsultores.ventaboletos.service.EmpresaService; -import com.rjconsultores.ventaboletos.service.SapService; -import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; -import com.rjconsultores.ventaboletos.web.gui.controladores.job.IntegracaoSapJob; -import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; -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; @@ -35,13 +24,24 @@ import org.zkoss.zul.Comboitem; import org.zkoss.zul.Datebox; import org.zkoss.zul.Messagebox; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.PuntoVenta; +import com.rjconsultores.ventaboletos.service.EmpresaService; +import com.rjconsultores.ventaboletos.service.SapService; +import com.rjconsultores.ventaboletos.vo.integracao.FechamentoCntCorrenteVO; +import com.rjconsultores.ventaboletos.web.gui.controladores.job.IntegracaoSapJob; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderFechamentoCntcorrente; + @Controller("relatorioSapController") @Scope("prototype") 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 9e1bb49f9..591c0f7d4 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 @@ -4,22 +4,18 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.zip.Deflater; 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; @@ -39,15 +35,9 @@ import org.zkoss.zul.Paging; import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.enums.TipoDescontoBPe; -import com.rjconsultores.ventaboletos.enums.TipoIdentificacionDoc; -import com.rjconsultores.ventaboletos.exception.BusinessException; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.SisdapService; -import com.rjconsultores.ventaboletos.utilerias.MoneyHelper; -import com.rjconsultores.ventaboletos.utilerias.TimeZoneUtil; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.vo.OrgaoConcedente.RelatorioGratuidadeAgepanVO; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox; @@ -62,7 +52,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 76a5b585b..9417cb529 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,8 +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; @@ -44,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 a495eed1c..694314bc0 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,8 +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; @@ -47,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/RelatorioTripulacaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTripulacaoController.java index 80178dc7f..41500afe8 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTripulacaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/relatorios/RelatorioTripulacaoController.java @@ -31,7 +31,7 @@ public class RelatorioTripulacaoController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - // private Logger logger = Logger.getLogger(RelatorioTripulacaoController.class); + // private Logger logger = LogManager.getLogger(RelatorioTripulacaoController.class); private Datebox datInicial; private Datebox datFinal; 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 8b7f0d45b..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,8 +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; @@ -53,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 b52d3bad0..62185e729 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,8 +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; @@ -40,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 b7b400bd6..623a4fe95 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,8 +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; @@ -52,7 +52,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 3d3462092..50f017931 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,8 +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; @@ -58,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 4da3fc156..58d5447a5 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,8 +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; @@ -41,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 ebfe472c9..1eac68eb0 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,8 +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; @@ -43,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 c05c9aaa9..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,8 +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; @@ -21,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 7e0a2fa0a..4f44349ac 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,8 +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; @@ -52,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 2d2315bc2..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,8 +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; @@ -50,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 1be8ec6d2..2561bd2ff 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,8 +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; @@ -31,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 4cc524a41..985738f5c 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,8 +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; @@ -41,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 29fb6b0ac..a9b873656 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,8 +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; @@ -47,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 6d22004a9..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,8 +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; @@ -43,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 e187dd26a..0feed5a84 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,8 +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; @@ -23,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 760fb57e1..ddf451fe2 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 @@ -4,15 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; -import com.rjconsultores.ventaboletos.entidad.Autorizacion; -import com.rjconsultores.ventaboletos.service.AutorizacionService; -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 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,6 +20,12 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.Autorizacion; +import com.rjconsultores.ventaboletos.service.AutorizacionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -36,7 +38,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 5e816c31f..2cd46bffe 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 @@ -4,19 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; -import com.rjconsultores.ventaboletos.entidad.Autorizacion; -import com.rjconsultores.ventaboletos.entidad.AutorizacionPerfil; -import com.rjconsultores.ventaboletos.entidad.Perfil; -import com.rjconsultores.ventaboletos.service.AutorizacionPerfilService; -import com.rjconsultores.ventaboletos.service.AutorizacionService; -import com.rjconsultores.ventaboletos.service.PerfilService; -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 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; @@ -28,6 +20,16 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.Autorizacion; +import com.rjconsultores.ventaboletos.entidad.AutorizacionPerfil; +import com.rjconsultores.ventaboletos.entidad.Perfil; +import com.rjconsultores.ventaboletos.service.AutorizacionPerfilService; +import com.rjconsultores.ventaboletos.service.AutorizacionService; +import com.rjconsultores.ventaboletos.service.PerfilService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -49,7 +51,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 a27da4425..055a21dc0 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 @@ -4,6 +4,25 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Messagebox; +import org.zkoss.zul.Textbox; + import com.rjconsultores.ventaboletos.entidad.CompaniaBancaria; import com.rjconsultores.ventaboletos.entidad.MerchantBancario; import com.rjconsultores.ventaboletos.entidad.UsuarioBancario; @@ -15,23 +34,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderMerchantBancario; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderUsuarioBancario; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Messagebox; -import org.zkoss.zul.Textbox; /** * @@ -54,7 +56,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 380679ac6..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,8 +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; @@ -107,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 b9eadce65..38e1dfcf3 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,8 +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; @@ -35,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 250c8137f..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,8 +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; @@ -35,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 019bef6ac..31497df03 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,8 +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; @@ -34,7 +34,6 @@ import com.rjconsultores.ventaboletos.service.MensajePuntaVentaService; import com.rjconsultores.ventaboletos.service.MensajeService; import com.rjconsultores.ventaboletos.service.MensajeUsuarioService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderMensajeEmpresa; @@ -45,7 +44,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 2128f65ba..05f28ce54 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 @@ -4,17 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; -import com.rjconsultores.ventaboletos.entidad.FuncionSistema; -import com.rjconsultores.ventaboletos.entidad.Sistema; -import com.rjconsultores.ventaboletos.service.FuncionSistemaService; -import com.rjconsultores.ventaboletos.service.SistemaService; -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 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,6 +20,14 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.FuncionSistema; +import com.rjconsultores.ventaboletos.entidad.Sistema; +import com.rjconsultores.ventaboletos.service.FuncionSistemaService; +import com.rjconsultores.ventaboletos.service.SistemaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author rodrigo @@ -43,7 +45,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/EditarMerchantBancarioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMerchantBancarioController.java index f20f15cba..7d3e8bafc 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMerchantBancarioController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/seguridad/EditarMerchantBancarioController.java @@ -1,75 +1,77 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; - -import com.rjconsultores.ventaboletos.entidad.CompaniaBancaria; -import com.rjconsultores.ventaboletos.entidad.MerchantBancario; -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 java.util.List; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; - -/** - * - * @author Administrador - */ -@Controller("editarMerchantBancarioController") -@Scope("prototype") -public class EditarMerchantBancarioController extends MyGenericForwardComposer { - - private CompaniaBancaria companiaBancaria; - private MerchantBancario merchantBancario; - private List lsMerchantBancario; - private MyListbox merchantBancarioList; - - public MerchantBancario getMerchantBancario() { - return merchantBancario; - } - - public void setMerchantBancario(MerchantBancario merchantBancario) { - this.merchantBancario = merchantBancario; - } - - @Override - public void doAfterCompose(Component comp) throws Exception { - super.doAfterCompose(comp); - - companiaBancaria = (CompaniaBancaria) Executions.getCurrent().getArg().get("companiaBancaria"); - merchantBancarioList = (MyListbox) Executions.getCurrent().getArg().get("merchantBancarioList"); - lsMerchantBancario = (List) Executions.getCurrent().getArg().get("lsMerchantBancario"); - - merchantBancario = new MerchantBancario(); - merchantBancario.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); - merchantBancario.setActivo(Boolean.TRUE); - merchantBancario.setFecmodif(Calendar.getInstance().getTime()); - merchantBancario.setCompaniaBancaria(companiaBancaria); - } - - public void onClick$btnSalvar(Event ev) throws InterruptedException { - - for (MerchantBancario ub : lsMerchantBancario) { - if (ub.getCvemerchant().equals(merchantBancario.getCvemerchant())) { - Messagebox.show( - Labels.getLabel("MSG.Registro.Existe"), - Labels.getLabel("editarMerchantBancarioController.window.title"), - Messagebox.OK, Messagebox.EXCLAMATION); - - return; - } - } - - lsMerchantBancario.add(merchantBancario); - merchantBancarioList.setData(lsMerchantBancario); - closeWindow(); - } -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; + +import java.util.Calendar; +import java.util.List; + +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; + +import com.rjconsultores.ventaboletos.entidad.CompaniaBancaria; +import com.rjconsultores.ventaboletos.entidad.MerchantBancario; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + +/** + * + * @author Administrador + */ +@Controller("editarMerchantBancarioController") +@Scope("prototype") +public class EditarMerchantBancarioController extends MyGenericForwardComposer { + + private CompaniaBancaria companiaBancaria; + private MerchantBancario merchantBancario; + private List lsMerchantBancario; + private MyListbox merchantBancarioList; + + public MerchantBancario getMerchantBancario() { + return merchantBancario; + } + + public void setMerchantBancario(MerchantBancario merchantBancario) { + this.merchantBancario = merchantBancario; + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + super.doAfterCompose(comp); + + companiaBancaria = (CompaniaBancaria) Executions.getCurrent().getArg().get("companiaBancaria"); + merchantBancarioList = (MyListbox) Executions.getCurrent().getArg().get("merchantBancarioList"); + lsMerchantBancario = (List) Executions.getCurrent().getArg().get("lsMerchantBancario"); + + merchantBancario = new MerchantBancario(); + merchantBancario.setUsuarioId(UsuarioLogado.getUsuarioLogado().getUsuarioId()); + merchantBancario.setActivo(Boolean.TRUE); + merchantBancario.setFecmodif(Calendar.getInstance().getTime()); + merchantBancario.setCompaniaBancaria(companiaBancaria); + } + + public void onClick$btnSalvar(Event ev) throws InterruptedException { + + for (MerchantBancario ub : lsMerchantBancario) { + if (ub.getCvemerchant().equals(merchantBancario.getCvemerchant())) { + Messagebox.show( + Labels.getLabel("MSG.Registro.Existe"), + Labels.getLabel("editarMerchantBancarioController.window.title"), + Messagebox.OK, Messagebox.EXCLAMATION); + + return; + } + } + + lsMerchantBancario.add(merchantBancario); + merchantBancarioList.setData(lsMerchantBancario); + closeWindow(); + } +} 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 112c1d70f..dc8d85917 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,8 +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; @@ -58,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 c20a2285f..504b6e59e 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,8 +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; @@ -27,8 +27,6 @@ import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; -import org.zkoss.zul.Comboitem; -import org.zkoss.zul.ComboitemRenderer; import org.zkoss.zul.Radio; import org.zkoss.zul.Radiogroup; import org.zkoss.zul.Textbox; @@ -56,7 +54,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 7afa7a871..1298b2c03 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,7 +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; @@ -22,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 6129ff652..493b3268a 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 @@ -4,14 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.seguridad; -import com.rjconsultores.ventaboletos.entidad.Sistema; -import com.rjconsultores.ventaboletos.service.SistemaService; -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; @@ -23,6 +19,12 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.Sistema; +import com.rjconsultores.ventaboletos.service.SistemaService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author rodrigo @@ -37,7 +39,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 772bd1719..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,8 +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; @@ -76,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 85c63fc61..941a3eb63 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,8 +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; @@ -31,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 77326a952..9dbe3450e 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,8 +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; @@ -23,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 beb6c71a7..41d9f4d97 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,8 +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; @@ -36,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 04fc262ee..e5867eb22 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,8 +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; @@ -36,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 d3ece4d81..90ca61d58 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,8 +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; @@ -52,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 232889e8c..9c1c68a1e 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,8 +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; @@ -25,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 5b729d766..dfd8a4d55 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,8 +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; @@ -95,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 e9cd5ce14..0714e21cb 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,8 +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; @@ -38,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 d0a87531c..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,8 +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; @@ -55,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 35037d28e..774140d41 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 @@ -4,6 +4,24 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Spinner; + import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.ParamAcumulaMasivo; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -11,23 +29,6 @@ import com.rjconsultores.ventaboletos.service.ParamAcumulaMasivoService; 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 java.util.Date; -import java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.zkoss.zk.ui.Component; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Spinner; /** * @@ -44,7 +45,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 636ea5203..ffa29489d 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 @@ -4,6 +4,26 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zkplus.databind.BindingListModelList; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Datebox; +import org.zkoss.zul.Spinner; + import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.FormaPago; @@ -18,24 +38,6 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; 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 java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.zkoss.zk.ui.Component; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zkplus.databind.BindingListModelList; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Comboitem; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Spinner; /** * @@ -60,7 +62,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 b8103242f..ec957c5bf 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 @@ -4,6 +4,21 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; +import java.util.Calendar; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Datebox; + import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.ParamCanjePunto; import com.rjconsultores.ventaboletos.service.ParadaService; @@ -13,21 +28,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.zkoss.zk.ui.Component; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zk.ui.util.Clients; -import org.zkoss.zul.Button; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Doublebox; /** * @@ -44,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 a4ed0d729..bf16b0715 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 @@ -4,27 +4,28 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Datebox; + import com.rjconsultores.ventaboletos.entidad.ParamCompraPunto; import com.rjconsultores.ventaboletos.service.ParamCompraPuntoService; import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; 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 java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.zkoss.zk.ui.Component; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Datebox; -import org.zkoss.zul.Doublebox; /** * @@ -38,7 +39,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 0ab042e20..665713d18 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 @@ -4,6 +4,22 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; + import com.rjconsultores.ventaboletos.entidad.Empresa; import com.rjconsultores.ventaboletos.entidad.ParamCostoTarjeta; import com.rjconsultores.ventaboletos.service.EmpresaService; @@ -12,20 +28,6 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; 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 java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.zkoss.zk.ui.Component; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; /** * @@ -43,7 +45,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 81c8bbaa1..5391a0fbf 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 @@ -4,15 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; -import com.rjconsultores.ventaboletos.entidad.TipoDomicilio; -import com.rjconsultores.ventaboletos.service.TipoDomicilioService; -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 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,6 +20,12 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.TipoDomicilio; +import com.rjconsultores.ventaboletos.service.TipoDomicilioService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -40,7 +42,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 ac04af981..8777e60ab 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 @@ -4,15 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; -import com.rjconsultores.ventaboletos.entidad.TipoMovimiento; -import com.rjconsultores.ventaboletos.service.TipoMovimientoService; -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 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,6 +20,12 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.TipoMovimiento; +import com.rjconsultores.ventaboletos.service.TipoMovimientoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -39,7 +41,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 c70be9fc2..e2177c3eb 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 @@ -4,15 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.sendaAmigo; -import com.rjconsultores.ventaboletos.entidad.TipoOcupacion; -import com.rjconsultores.ventaboletos.service.TipoOcupacionService; -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 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,6 +20,12 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Textbox; +import com.rjconsultores.ventaboletos.entidad.TipoOcupacion; +import com.rjconsultores.ventaboletos.service.TipoOcupacionService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -40,7 +42,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 9b1ac2c62..f962ef55c 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,8 +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; @@ -59,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 6ba2814e6..5a621314a 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,8 +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; @@ -52,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 e7177f6df..74bf77254 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 @@ -3,8 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; import java.util.HashMap; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +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 +28,7 @@ public class BusquedaPrecoApanheController extends MyGenericForwardComposer { private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(BusquedaPrecoApanheController.class); + private static Logger log = LogManager.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 393fad81b..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,8 +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; @@ -133,7 +133,7 @@ public class BusquedaTarifaController extends MyGenericForwardComposer { private Combobox cmbVende; private Boolean vende; - private static 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 1ef6c5592..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,8 +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; @@ -59,7 +59,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTarifaEmbarcada @Scope("prototype") public class BusquedaTarifaEmbarcadaController extends MyGenericForwardComposer { - private static 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 88bc5d854..6e638935b 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,8 +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; @@ -38,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 007b1d0e9..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; @@ -62,7 +63,7 @@ public class EditarCasetaPeajeController extends MyGenericForwardComposer { private MyTextboxDecimal quantiaIda; private MyTextboxDecimal quantiaVolta; private MyTextboxDecimal valorFixo; - private static final Logger logger = Logger.getLogger(EditarCasetaPeajeController.class); + 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 a2ddfd70e..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,8 +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; @@ -30,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 0b97ab954..128e673a8 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 @@ -4,18 +4,10 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; -import com.rjconsultores.ventaboletos.entidad.ExcepcionRedondo; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.ExcepcionRedondoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; -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; @@ -27,6 +19,15 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import org.zkoss.zul.Radio; +import com.rjconsultores.ventaboletos.entidad.ExcepcionRedondo; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.ExcepcionRedondoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author Administrador @@ -44,7 +45,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 3abfb2861..3910596b8 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 @@ -4,19 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; -import com.rjconsultores.ventaboletos.entidad.ClaseServicio; -import com.rjconsultores.ventaboletos.entidad.MercadoCompetido; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.service.ClaseServicioService; -import com.rjconsultores.ventaboletos.service.MercadoCompetidoService; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; -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; @@ -29,6 +21,16 @@ import org.zkoss.zul.Button; import org.zkoss.zul.Combobox; import org.zkoss.zul.Comboitem; +import com.rjconsultores.ventaboletos.entidad.ClaseServicio; +import com.rjconsultores.ventaboletos.entidad.MercadoCompetido; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.service.ClaseServicioService; +import com.rjconsultores.ventaboletos.service.MercadoCompetidoService; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxParada; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; + /** * * @author rodrigo @@ -48,7 +50,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 75fdd0455..0f144ecf0 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,8 +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; @@ -62,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 928a152c9..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,8 +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; @@ -33,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 9b1682a57..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,8 +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; @@ -79,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 ecec1908e..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,8 +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; @@ -50,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 dbf6fd1ce..af2bd9e96 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,8 +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; @@ -15,9 +15,7 @@ import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.SeguradoraEmpresa; -import com.rjconsultores.ventaboletos.entidad.SeguroKm; import com.rjconsultores.ventaboletos.service.EmpresaService; import com.rjconsultores.ventaboletos.service.SeguradoraEmpresaService; import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxEstandar; @@ -43,7 +41,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 26d411d04..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,8 +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; @@ -62,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 76858987e..2cc278365 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 @@ -4,13 +4,12 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; 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; @@ -21,6 +20,7 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zul.Button; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.SeguroTarifa; import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; import com.rjconsultores.ventaboletos.service.SeguroTarifaService; @@ -54,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 5594477fc..046d25072 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 @@ -4,11 +4,31 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Comboitem; +import org.zkoss.zul.Textbox; + import com.rjconsultores.ventaboletos.entidad.Categoria; import com.rjconsultores.ventaboletos.entidad.Ciudad; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Marca; -import com.rjconsultores.ventaboletos.entidad.MercadoCompetido; import com.rjconsultores.ventaboletos.entidad.Moneda; import com.rjconsultores.ventaboletos.entidad.Parada; import com.rjconsultores.ventaboletos.entidad.Plaza; @@ -16,7 +36,6 @@ import com.rjconsultores.ventaboletos.entidad.Tarifa; import com.rjconsultores.ventaboletos.entidad.TarifaCategoria; import com.rjconsultores.ventaboletos.entidad.TarifaTipoptovta; import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Tramo; import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.CiudadService; @@ -36,25 +55,6 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTarifaCategoria; import com.rjconsultores.ventaboletos.web.utilerias.render.RenderTarifaTipoPuntoVenta; -import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import org.apache.log4j.Logger; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Comboitem; -import org.zkoss.zul.Textbox; /** * @@ -119,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 b492279bf..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,8 +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; @@ -91,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 79774268c..105c0d26c 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,8 +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; @@ -55,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 279369b49..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,8 +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; @@ -109,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 ec385c985..7580d9798 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 @@ -4,16 +4,30 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zhtml.Messagebox; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zul.Button; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Textbox; + import com.rjconsultores.ventaboletos.entidad.Categoria; -import com.rjconsultores.ventaboletos.entidad.Ciudad; import com.rjconsultores.ventaboletos.entidad.ClaseServicio; import com.rjconsultores.ventaboletos.entidad.Marca; import com.rjconsultores.ventaboletos.entidad.Moneda; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Plaza; import com.rjconsultores.ventaboletos.entidad.TarifaOficial; import com.rjconsultores.ventaboletos.entidad.TipoPuntoVenta; -import com.rjconsultores.ventaboletos.entidad.Tramo; import com.rjconsultores.ventaboletos.service.CategoriaService; import com.rjconsultores.ventaboletos.service.CiudadService; import com.rjconsultores.ventaboletos.service.ClaseServicioService; @@ -27,22 +41,6 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; 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.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zhtml.Messagebox; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.Executions; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zul.Button; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Textbox; /** * @@ -98,7 +96,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 9eb021503..94b2b1201 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,8 +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; @@ -40,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 6dbd83e04..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,8 +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 +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 a0f537fb2..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,8 +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; @@ -71,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 852d7e7d7..6be53d62e 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 @@ -4,13 +4,12 @@ */ package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; -import java.text.SimpleDateFormat; 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; @@ -49,7 +48,7 @@ public class EditarVigenciaTarifaController extends MyGenericForwardComposer { private Datebox fecInicio; private Datebox fecFinal; private Datebox fecVenta; - private static final 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 5c9c3f770..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,8 +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; @@ -47,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/GenerarTarifaOrgaoController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java index 0a76e91f7..1454c30ba 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java +++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/GenerarTarifaOrgaoController.java @@ -1,672 +1,672 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ -package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.hibernate.LazyInitializationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Controller; -import org.zkoss.util.resource.Labels; -import org.zkoss.zk.ui.Component; -import org.zkoss.zk.ui.event.CheckEvent; -import org.zkoss.zk.ui.event.Event; -import org.zkoss.zkplus.databind.BindingListModelList; -import org.zkoss.zul.Checkbox; -import org.zkoss.zul.Combobox; -import org.zkoss.zul.Constraint; -import org.zkoss.zul.Div; -import org.zkoss.zul.Messagebox; - -import com.rjconsultores.ventaboletos.constantes.TipoSeguro; -import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; -import com.rjconsultores.ventaboletos.entidad.Constante; -import com.rjconsultores.ventaboletos.entidad.Empresa; -import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; -import com.rjconsultores.ventaboletos.entidad.Parada; -import com.rjconsultores.ventaboletos.entidad.Ruta; -import com.rjconsultores.ventaboletos.entidad.RutaCaseta; -import com.rjconsultores.ventaboletos.entidad.RutaEmpresa; -import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; -import com.rjconsultores.ventaboletos.entidad.Usuario; -import com.rjconsultores.ventaboletos.exception.BusinessException; -import com.rjconsultores.ventaboletos.service.CasetaPeajeService; -import com.rjconsultores.ventaboletos.service.ConstanteService; -import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; -import com.rjconsultores.ventaboletos.service.ParadaService; -import com.rjconsultores.ventaboletos.service.RutaEmpresaService; -import com.rjconsultores.ventaboletos.service.RutaService; -import com.rjconsultores.ventaboletos.service.TarifaOficialService; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import com.rjconsultores.ventaboletos.utilerias.CustomEnum; -import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; -import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -import com.rjconsultores.ventaboletos.web.utilerias.render.RenderParada; -import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRutaDesc; - -/** - * - * @author Gleimar - */ -@Controller("generarTarifaOrgaoController") -@Scope("prototype") -public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { - - private static final long serialVersionUID = 1L; - private static Logger log = LoggerFactory.getLogger(GenerarTarifaOrgaoController.class); - - @Autowired - private RutaService rutaService; - @Autowired - private RutaEmpresaService rutaEmpresaService; - @Autowired - private TarifaOficialService tarifaOficialService; - @Autowired - private OrgaoConcedenteService orgaoConcedenteService; - @Autowired - private ParadaService paradaService; - @Autowired - private CasetaPeajeService casetaPeajeService; - @Autowired - private ConstanteService constanteService; - private List lsParada; - private List lsRuta; - private List lsOrgaoConcedente; - private List lsEmpresa; - private Combobox cmbRuta; - private Combobox cmbOrgaoConcedente; - private Combobox cmbEmpresa; - private Combobox cmbParada; - - private Checkbox chkTarifa; - private Checkbox chkTaxaEmbarque; - private Checkbox chkArredondarTaxaEmbarque; - private Checkbox chkSeguro; - private Checkbox chkZerarTabela; - private Checkbox chkPedagio; - private Checkbox chkGerarTaxaDeEmbarquePorLocalidade; - private Checkbox chkTipoSeguro; - private List listSelectedRutas; - private MyListbox selectedRutasList; - private List listSelectedParadas; - private MyListbox selectedParadasList; - private List lsEmpresaSelected; - private Combobox cmbCasetaPeaje; - private List listSelectedCasetaPeaje; - private MyListbox selectedCasetaPeajeList; - private List lsCasetaPeaje; - private Boolean esperar = false; - private Div paradaDiv; - Set lsIdsOrgSemIndice = new HashSet(); - private Boolean filtraPorPracaDePedagio=false; - private Div casetaPeajeDiv; - - public static final String FILTRAR_POR_PRACA_DE_PEDAGIO = "FILTRAR_POR_PRACA_DE_PEDAGIO"; - - - public Div getParadaDiv() { - return paradaDiv; - } - - public void setParadaDiv(Div paradaDiv) { - this.paradaDiv = paradaDiv; - } - - public List getLsEmpresaSelected() { - return lsEmpresaSelected; - } - - public void setLsEmpresaSelected(List lsEmpresaSelected) { - this.lsEmpresaSelected = lsEmpresaSelected; - } - - public List getLsRuta() { - return lsRuta; - } - - - public void setLsRuta(List lsRuta) { - this.lsRuta = lsRuta; - } - - public List getLsOrgaoConcedente() { - return lsOrgaoConcedente; - } - - public List getLsEmpresa() { - return lsEmpresa; - } - - @Override - public void doAfterCompose(Component comp) throws Exception { - lsOrgaoConcedente = orgaoConcedenteService.obtenerTodos(); - lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); - lsRuta = rutaService.buscarRutasPorEmpresas(lsEmpresa); - - - - super.doAfterCompose(comp); - selectedRutasList.setItemRenderer(new RenderRutaDesc()); - selectedParadasList.setItemRenderer(new RenderParada()); - listSelectedRutas = new ArrayList(); - lsEmpresaSelected = new ArrayList(); - - listSelectedParadas = new ArrayList(); - paradaDiv.setVisible(false); - - if (!ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.EXIBE_TPP.getDescricao())) { - chkTipoSeguro.setVisible(false); - } - - lsCasetaPeaje = casetaPeajeService.buscarTodosOrdenadoPorDescricao(); - listSelectedCasetaPeaje = new ArrayList(); - filtraPorPracaDePedagio=buscarContantefiltrarPorPracaDePedagio(); - casetaPeajeDiv.setVisible(false); - - - - - } - - public void onClick$chkZerarTabela(Event ev) - { - if (chkZerarTabela.isChecked()) - { - chkTarifa.setChecked(false); - chkTarifa.setDisabled(true); - chkTaxaEmbarque.setChecked(false); - chkTaxaEmbarque.setDisabled(true); - chkSeguro.setChecked(false); - chkSeguro.setDisabled(true); - chkTipoSeguro.setDisabled(true); - chkPedagio.setChecked(false); - chkTipoSeguro.setChecked(false); - chkPedagio.setDisabled(true); - chkArredondarTaxaEmbarque.setChecked(false); - chkArredondarTaxaEmbarque.setDisabled(true); - paradaDiv.setVisible(true); - } else - { - chkTarifa.setDisabled(false); - chkTarifa.setChecked(true); - chkTaxaEmbarque.setDisabled(false); - chkSeguro.setDisabled(false); - chkTipoSeguro.setDisabled(false); - chkPedagio.setDisabled(false); - chkArredondarTaxaEmbarque.setDisabled(false); - chkArredondarTaxaEmbarque.setChecked(true); - paradaDiv.setVisible(false); - } - } - - public void onCheck$chkPedagio(CheckEvent ev) { - if (filtraPorPracaDePedagio) { - if (chkPedagio.isChecked()) { - casetaPeajeDiv.setVisible(true); - } else { - casetaPeajeDiv.setVisible(false); - listSelectedCasetaPeaje = new ArrayList(); - selectedCasetaPeajeList.clear(); - } - } - } - - public void onCheck$chkGerarTaxaDeEmbarquePorLocalidade(CheckEvent ev) - { - if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) - { - listSelectedParadas = new ArrayList(); - carregarParadas(); - chkTaxaEmbarque.setChecked(true); - chkTaxaEmbarque.setDisabled(true); - chkTarifa.setChecked(false); - chkTarifa.setDisabled(true); - chkSeguro.setChecked(false); - chkSeguro.setDisabled(true); - chkTipoSeguro.setDisabled(true); - chkPedagio.setChecked(false); - chkTipoSeguro.setChecked(false); - chkPedagio.setDisabled(true); - paradaDiv.setVisible(true); - } else - { - listSelectedParadas = new ArrayList(); - selectedParadasList.setData(listSelectedParadas); - chkTarifa.setDisabled(false); - chkTarifa.setChecked(true); - chkTaxaEmbarque.setDisabled(false); - chkTaxaEmbarque.setChecked(false); - chkSeguro.setDisabled(false); - chkTipoSeguro.setDisabled(false); - chkPedagio.setDisabled(false); - chkArredondarTaxaEmbarque.setDisabled(false); - chkArredondarTaxaEmbarque.setChecked(true); - paradaDiv.setVisible(false); - lsParada=null; - - } - } - - public void onClick$btnGenerarVigencia(Event ev) throws InterruptedException { - Boolean limparRutas = false; - cmbOrgaoConcedente.getValue(); - cmbEmpresa.getValue(); - - OrgaoConcedente orgaoConcedente = null; - - if (cmbOrgaoConcedente.getSelectedItem() != null) { - orgaoConcedente = ((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue()); - } - - lsEmpresaSelected = Arrays.asList((Empresa) cmbEmpresa.getSelectedItem().getValue()); - - - if (orgaoConcedente == null) { - int resp = Messagebox.show( - Labels.getLabel("generarTarifaOrgaoController.MSG.gerarTodosOrgaos"), - Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), - Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); - - if (resp == Messagebox.NO) { - return; - } - } - - if (listSelectedRutas == null || listSelectedRutas.isEmpty()) { - limparRutas = true; - if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { - lsRuta = rutaService.buscarRutasPorEmpresaOrgaoConcedenteParadaIds((Empresa) cmbEmpresa.getSelectedItem().getValue(), orgaoConcedente, converteListIdsEmArrayIds(retornarListParadaIds(listSelectedParadas))); - } else { - if(!listSelectedCasetaPeaje.isEmpty()) { - lsRuta = rutaService.buscarPorOrgaoEcasetaPeaje(orgaoConcedente, converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(listSelectedCasetaPeaje),(Empresa) cmbEmpresa.getSelectedItem().getValue()); - // orgao = null; - List lsRutaAux = new ArrayList(); - lsRutaAux.addAll(lsRuta); - for (Ruta r : lsRutaAux) { - if (r.getOrgaoConcedente().getIndicePeaje() == null) { - lsRuta.remove(r); - } - } - } - - } - listSelectedRutas = lsRuta; - - } else if (chkPedagio.isChecked() && !validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio()) { - return; - } - - if (!chkZerarTabela.isChecked()) { - try { - Usuario usuario = UsuarioLogado.getUsuarioLogado(); - log.info("INICIO DE GERAR TARIFA OFICIAL -- USUARIO: " + usuario.getUsuarioId()); - - if (chkTarifa.isChecked()) { - tarifaOficialService.gerarAtualizarTarifa(listSelectedRutas, orgaoConcedente, lsEmpresaSelected,converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(listSelectedCasetaPeaje)); - log.info("FIM DE GERAR TARIFA OFICIAL -- TARIFA"); - } - - boolean gerarTabelaZerada = !chkTarifa.isChecked(); - List lsParadaIds =null; - if (chkTaxaEmbarque.isChecked()) { - if(chkGerarTaxaDeEmbarquePorLocalidade.isChecked() && !listSelectedParadas.isEmpty()) { - lsParadaIds=retornarListParadaIds(listSelectedParadas); - } - tarifaOficialService.atualizarTaxaEmbarque(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), gerarTabelaZerada, lsEmpresaSelected,lsParadaIds); - - log.info("FIM DE GERAR TARIFA OFICIAL -- TAXA DE EMBARQUE"); - } - - if (chkSeguro.isChecked()) { - tarifaOficialService.atualizarSeguro(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), TipoSeguro.SEGURO); - } - - if (chkTipoSeguro.isChecked()) { - tarifaOficialService.atualizarSeguro(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), TipoSeguro.TPP); - log.info("FIM DE GERAR TARIFA OFICIAL -- SEGURO"); - } - - if (chkPedagio.isChecked()) { - if(listSelectedCasetaPeaje.isEmpty()) { - tarifaOficialService.atualizarPedagio(); - }else { - tarifaOficialService.atualizarPedagioPorListaDePracaDePagio(listSelectedCasetaPeaje, retornarEmpresaId()); - } - - log.info("FIM DE GERAR TARIFA OFICIAL -- PEDAGIO"); - } - - if (chkTipoSeguro.isChecked()) { - tarifaOficialService.atualizarSeguroTPP(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), TipoSeguro.TPP); - log.info("FIM DE GERAR TARIFA OFICIAL -- SEGURO OPCIONAL"); - } - - tarifaOficialService.aplicarArredondamentoTarifa(orgaoConcedente.getOrgaoConcedenteId(), chkArredondarTaxaEmbarque.isChecked()); - - long l = tarifaOficialService.obtenerCount(lsEmpresaSelected); - log.info("FIM DE GERAR TARIFA OFICIAL: -- USUARIO: " + usuario.getUsuarioId() + "Foram gerados " + l + " registros."); - - Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK", new Object[] { l }), - Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), - Messagebox.OK, Messagebox.INFORMATION); - - } catch (BusinessException e) { - log.error("ERROR AO GERAR TARIFA OFICIAL:", e); - Messagebox.show(e.getLocalizedMessage(), - Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), - Messagebox.OK, Messagebox.EXCLAMATION); - } - } else { - try { - tarifaOficialService.gerarAtualizarTabelaZerada(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), lsEmpresaSelected,null); - - Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK"), - Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), - Messagebox.OK, Messagebox.INFORMATION); - } catch (BusinessException e) { - log.error("ERROR AO GERAR TARIFA OFICIAL:", e); - Messagebox.show(e.getLocalizedMessage(), - Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), - Messagebox.OK, Messagebox.EXCLAMATION); - } - } - if (limparRutas) { - listSelectedRutas.clear(); - } - } - - private Integer retornarEmpresaId() { - Empresa empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue(); - return empresa.getEmpresaId(); - } - - public List getListSelectedRutas() { - return listSelectedRutas; - } - - public void setListSelectedRutas(List listSelectedRutas) { - this.listSelectedRutas = listSelectedRutas; - } - - public void onClick$btnAddRuta(Event ev) throws InterruptedException { - if (esperar) { - cmbRuta.setSelectedItem(null); - return; - } - if (cmbRuta.getSelectedItem() != null) { - listSelectedRutas.add((Ruta) cmbRuta.getSelectedItem().getValue()); - selectedRutasList.setData(listSelectedRutas); - cmbRuta.setSelectedItem(null); - if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { - carregarParadas(); - } - } - } - - public void onClick$btnRemoveRuta(Event ev) throws InterruptedException { - Ruta ruta = (Ruta) selectedRutasList.getSelected(); - listSelectedRutas.remove(ruta); - selectedRutasList.setData(listSelectedRutas); - if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { - carregarParadas(); - } - } - - - public void onClick$btnAddParada(Event ev) throws InterruptedException { - if (esperar) { - cmbParada.setSelectedItem(null); - return; - } - if (cmbParada.getSelectedItem() != null) { - listSelectedParadas.add((Parada) cmbParada.getSelectedItem().getValue()); - selectedParadasList.setData(listSelectedParadas); - cmbParada.setSelectedItem(null); - } - } - - public void onClick$btnRemovePArada(Event ev) throws InterruptedException { - Parada parada = (Parada) selectedParadasList.getSelected(); - listSelectedParadas.remove(parada); - selectedParadasList.setData(listSelectedParadas); - } - - - - public List getLsParada() { - return lsParada; - } - - - public void onSelect$cmbOrgaoConcedente(Event ev) { - onSelectEmpresaOrgaoConcedente(); - } - - public void onSelect$cmbEmpresa(Event ev) throws InterruptedException { - onSelectEmpresaOrgaoConcedente(); - } - - - - public void onSelectEmpresaOrgaoConcedente() { - Constraint constraint = cmbEmpresa.getConstraint(); - cmbEmpresa.setConstraint(""); - Empresa empresaSelected = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); - cmbEmpresa.setConstraint(constraint); - OrgaoConcedente orgaoSelected = cmbOrgaoConcedente.getSelectedItem() == null ? null : (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); - - esperar = true; - - lsRuta = rutaService.buscarRutasPorEmpresaOrgaoConcedente(empresaSelected, orgaoSelected); - - - BindingListModelList l = new BindingListModelList(lsRuta, true); - cmbRuta.setModel(l); - - - - int indexToRemove = 0; - boolean achou = false; - List indexList = new ArrayList(); - - for (final Ruta ruta : listSelectedRutas) { - if (orgaoSelected == null || orgaoSelected.getOrgaoConcedenteId() == -1 || ruta.getOrgaoConcedente().equals(orgaoSelected)) { - try { - ruta.getLsRutaEmpresa(); - } catch (LazyInitializationException e) { - ruta.setLsRutaEmpresa(rutaEmpresaService.obtenerPorRuta(ruta)); - } - for (RutaEmpresa rutaEmpresa : ruta.getLsRutaEmpresa()) { - if (empresaSelected == null || rutaEmpresa.getEmpresa().equals(empresaSelected)) { - achou = true; - } - } - } - if (!achou) { - indexList.add(indexToRemove); - } - indexToRemove++; - achou = false; - } - - for (Integer i : indexList) { - Ruta ruta = listSelectedRutas.get(i); - listSelectedRutas.remove(ruta); - } - if(chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { - carregarParadas(); - } - selectedRutasList.setData(listSelectedRutas); - cmbRuta.setSelectedItem(null); - esperar = false; - } - - private void carregarParadas() { - if (!listSelectedRutas.isEmpty()) { - lsParada = paradaService.obtenerOrigenPorListRutaIds(null, null, converteListIdsEmArrayIds(retornarListRutaIds(listSelectedRutas))); - } else { - if (lsRuta.isEmpty()) { - Constraint constraint = cmbEmpresa.getConstraint(); - cmbEmpresa.setConstraint(""); - Empresa empresaSelected = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); - cmbEmpresa.setConstraint(constraint); - OrgaoConcedente orgaoSelected = cmbOrgaoConcedente.getSelectedItem() == null ? null : (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); - lsParada = paradaService.obtenerOrigenPorListRutaIds(orgaoSelected == null ? null : orgaoSelected.getOrgaoConcedenteId(), empresaSelected == null ? null : empresaSelected.getEmpresaId(), null); - } else { - lsParada = paradaService.obtenerOrigenPorListRutaIds(null, null, converteListIdsEmArrayIds(retornarListRutaIds(lsRuta))); - } - } - - - List listSelectedParadasAux = new ArrayList(); - listSelectedParadasAux.addAll(listSelectedParadas); - if(!listSelectedParadas.isEmpty()) { - for(Parada parada :listSelectedParadasAux ) { - if(!lsParada.contains(parada)) { - listSelectedParadas.remove(parada); - } - } - } - - BindingListModelList l = new BindingListModelList(lsParada, true); - cmbParada.setModel(l); - - - selectedParadasList.setData(listSelectedParadas); - } - - - private Integer[] converteListIdsEmArrayIds(List ids) { - Integer[] arrayIds = new Integer[ids.size()]; - arrayIds = ids.toArray(arrayIds); - return arrayIds; - } - - private List retornarListRutaIds(List lsRutasSelecionadas) { - List listRutasId = new ArrayList(); - for (Ruta r : lsRutasSelecionadas) { - listRutasId.add(r.getRutaId()); - } - - return listRutasId; - } - - - private List retornarListParadaIds(List lsParadassSelecionadas) { - List listParadasId = new ArrayList(); - for (Parada p : lsParadassSelecionadas) { - listParadasId.add(p.getParadaId()); - } - return listParadasId; - } - - - public void onClick$btnAddCasetaPeaje(Event ev) throws InterruptedException { - if (cmbCasetaPeaje.getSelectedItem() != null) { - listSelectedCasetaPeaje.add((CasetaPeaje) cmbCasetaPeaje.getSelectedItem().getValue()); - selectedCasetaPeajeList.setData(listSelectedCasetaPeaje); - cmbCasetaPeaje.setSelectedItem(null); - } - } - - public void onClick$btnRemoveCasetaPeaje(Event ev) throws InterruptedException { - CasetaPeaje casetaPeaje= (CasetaPeaje) selectedCasetaPeajeList.getSelected(); - listSelectedCasetaPeaje.remove(casetaPeaje); - selectedCasetaPeajeList.setData(listSelectedCasetaPeaje); - } - - - private Boolean validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio() throws InterruptedException { - if (!listSelectedCasetaPeaje.isEmpty() && !listSelectedRutas.isEmpty()) { - List lsRutaAuxiliar = new ArrayList(); - retornarApenasRutaQuePossuiSecuenciasComAsPracas(lsRutaAuxiliar); - for (Ruta ruta : listSelectedRutas) { - if (!lsRutaAuxiliar.contains(ruta)) { - Messagebox.show(Labels.getLabel("calcularPeajeController.MSG.linhaSemPracaDePedagio", new Object[] { ruta }), - Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.OK, Messagebox.ERROR); - return false; - } - } - } - return true; - } - - private void retornarApenasRutaQuePossuiSecuenciasComAsPracas(List lsRutaAuxiliar) { - List listSelectedRutasAux = recarregarAsRutasComBanco(listSelectedRutas); - for (CasetaPeaje casetaPeaje : listSelectedCasetaPeaje) { - for (Ruta r : listSelectedRutasAux) { - if (!r.getRutaSecuenciaList().isEmpty()) { - Boolean isRutaSecuencia = false; - for (RutaSecuencia rutaSecuencia : r.getRutaSecuenciaList()) { - if (isRutaSecuencia) - break; - if (rutaSecuencia.getActivo()) { - for (RutaCaseta rutaCaseta : rutaSecuencia.getLsRutaCase()) { - if (rutaCaseta.getActivo() && rutaCaseta.getCasetaPeaje().getCasetaPeajeId().intValue() == casetaPeaje.getCasetaPeajeId().intValue()) { - lsRutaAuxiliar.add(r); - isRutaSecuencia = true; - break; - } - } - } - } - } - } - } - } - - - List recarregarAsRutasComBanco(List lsRutasSelecionadas){ - List lsRutaIds=retornarListRutaIds(lsRutasSelecionadas); - Integer[] arrayDeRutaIds = converteListIdsEmArrayIds(lsRutaIds); - return rutaService.buscarPorIds(arrayDeRutaIds); - } - - - private Integer[] converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(List lsCasetaPeaje) { - if(!lsCasetaPeaje.isEmpty()) { - return converteListIdsEmArrayIds(retornarListCasetaPeajeIds(lsCasetaPeaje)); - } - return null; - } - - - private List retornarListCasetaPeajeIds(List lsCasetaPeaje) { - List listCasetaPeaje= new ArrayList(); - for (CasetaPeaje c : lsCasetaPeaje) { - listCasetaPeaje.add(c.getCasetaPeajeId()); - } - return listCasetaPeaje; - } - - - public List getLsCasetaPeaje() { - return lsCasetaPeaje; - } - - public void setLsCasetaPeaje(List lsCasetaPeaje) { - this.lsCasetaPeaje = lsCasetaPeaje; - } - - private Boolean buscarContantefiltrarPorPracaDePedagio() { - Constante constante = constanteService.buscarPorNomeConstante(FILTRAR_POR_PRACA_DE_PEDAGIO); - if (constante != null) { - if(constante.getValorconstante().equalsIgnoreCase("true")) { - return true; - } - } - return false; - - } - -} +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package com.rjconsultores.ventaboletos.web.gui.controladores.tarifas; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hibernate.LazyInitializationException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Controller; +import org.zkoss.util.resource.Labels; +import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.event.CheckEvent; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zkplus.databind.BindingListModelList; +import org.zkoss.zul.Checkbox; +import org.zkoss.zul.Combobox; +import org.zkoss.zul.Constraint; +import org.zkoss.zul.Div; +import org.zkoss.zul.Messagebox; + +import com.rjconsultores.ventaboletos.constantes.TipoSeguro; +import com.rjconsultores.ventaboletos.entidad.CasetaPeaje; +import com.rjconsultores.ventaboletos.entidad.Constante; +import com.rjconsultores.ventaboletos.entidad.Empresa; +import com.rjconsultores.ventaboletos.entidad.OrgaoConcedente; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.entidad.Ruta; +import com.rjconsultores.ventaboletos.entidad.RutaCaseta; +import com.rjconsultores.ventaboletos.entidad.RutaEmpresa; +import com.rjconsultores.ventaboletos.entidad.RutaSecuencia; +import com.rjconsultores.ventaboletos.entidad.Usuario; +import com.rjconsultores.ventaboletos.exception.BusinessException; +import com.rjconsultores.ventaboletos.service.CasetaPeajeService; +import com.rjconsultores.ventaboletos.service.ConstanteService; +import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; +import com.rjconsultores.ventaboletos.service.ParadaService; +import com.rjconsultores.ventaboletos.service.RutaEmpresaService; +import com.rjconsultores.ventaboletos.service.RutaService; +import com.rjconsultores.ventaboletos.service.TarifaOficialService; +import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; +import com.rjconsultores.ventaboletos.utilerias.CustomEnum; +import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado; +import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderParada; +import com.rjconsultores.ventaboletos.web.utilerias.render.RenderRutaDesc; + +/** + * + * @author Gleimar + */ +@Controller("generarTarifaOrgaoController") +@Scope("prototype") +public class GenerarTarifaOrgaoController extends MyGenericForwardComposer { + + private static final long serialVersionUID = 1L; + private static Logger log = LogManager.getLogger(GenerarTarifaOrgaoController.class); + + @Autowired + private RutaService rutaService; + @Autowired + private RutaEmpresaService rutaEmpresaService; + @Autowired + private TarifaOficialService tarifaOficialService; + @Autowired + private OrgaoConcedenteService orgaoConcedenteService; + @Autowired + private ParadaService paradaService; + @Autowired + private CasetaPeajeService casetaPeajeService; + @Autowired + private ConstanteService constanteService; + private List lsParada; + private List lsRuta; + private List lsOrgaoConcedente; + private List lsEmpresa; + private Combobox cmbRuta; + private Combobox cmbOrgaoConcedente; + private Combobox cmbEmpresa; + private Combobox cmbParada; + + private Checkbox chkTarifa; + private Checkbox chkTaxaEmbarque; + private Checkbox chkArredondarTaxaEmbarque; + private Checkbox chkSeguro; + private Checkbox chkZerarTabela; + private Checkbox chkPedagio; + private Checkbox chkGerarTaxaDeEmbarquePorLocalidade; + private Checkbox chkTipoSeguro; + private List listSelectedRutas; + private MyListbox selectedRutasList; + private List listSelectedParadas; + private MyListbox selectedParadasList; + private List lsEmpresaSelected; + private Combobox cmbCasetaPeaje; + private List listSelectedCasetaPeaje; + private MyListbox selectedCasetaPeajeList; + private List lsCasetaPeaje; + private Boolean esperar = false; + private Div paradaDiv; + Set lsIdsOrgSemIndice = new HashSet(); + private Boolean filtraPorPracaDePedagio=false; + private Div casetaPeajeDiv; + + public static final String FILTRAR_POR_PRACA_DE_PEDAGIO = "FILTRAR_POR_PRACA_DE_PEDAGIO"; + + + public Div getParadaDiv() { + return paradaDiv; + } + + public void setParadaDiv(Div paradaDiv) { + this.paradaDiv = paradaDiv; + } + + public List getLsEmpresaSelected() { + return lsEmpresaSelected; + } + + public void setLsEmpresaSelected(List lsEmpresaSelected) { + this.lsEmpresaSelected = lsEmpresaSelected; + } + + public List getLsRuta() { + return lsRuta; + } + + + public void setLsRuta(List lsRuta) { + this.lsRuta = lsRuta; + } + + public List getLsOrgaoConcedente() { + return lsOrgaoConcedente; + } + + public List getLsEmpresa() { + return lsEmpresa; + } + + @Override + public void doAfterCompose(Component comp) throws Exception { + lsOrgaoConcedente = orgaoConcedenteService.obtenerTodos(); + lsEmpresa = UsuarioLogado.getUsuarioLogado().getEmpresa(); + lsRuta = rutaService.buscarRutasPorEmpresas(lsEmpresa); + + + + super.doAfterCompose(comp); + selectedRutasList.setItemRenderer(new RenderRutaDesc()); + selectedParadasList.setItemRenderer(new RenderParada()); + listSelectedRutas = new ArrayList(); + lsEmpresaSelected = new ArrayList(); + + listSelectedParadas = new ArrayList(); + paradaDiv.setVisible(false); + + if (!ApplicationProperties.getInstance().isCustomHabilitado(CustomEnum.EXIBE_TPP.getDescricao())) { + chkTipoSeguro.setVisible(false); + } + + lsCasetaPeaje = casetaPeajeService.buscarTodosOrdenadoPorDescricao(); + listSelectedCasetaPeaje = new ArrayList(); + filtraPorPracaDePedagio=buscarContantefiltrarPorPracaDePedagio(); + casetaPeajeDiv.setVisible(false); + + + + + } + + public void onClick$chkZerarTabela(Event ev) + { + if (chkZerarTabela.isChecked()) + { + chkTarifa.setChecked(false); + chkTarifa.setDisabled(true); + chkTaxaEmbarque.setChecked(false); + chkTaxaEmbarque.setDisabled(true); + chkSeguro.setChecked(false); + chkSeguro.setDisabled(true); + chkTipoSeguro.setDisabled(true); + chkPedagio.setChecked(false); + chkTipoSeguro.setChecked(false); + chkPedagio.setDisabled(true); + chkArredondarTaxaEmbarque.setChecked(false); + chkArredondarTaxaEmbarque.setDisabled(true); + paradaDiv.setVisible(true); + } else + { + chkTarifa.setDisabled(false); + chkTarifa.setChecked(true); + chkTaxaEmbarque.setDisabled(false); + chkSeguro.setDisabled(false); + chkTipoSeguro.setDisabled(false); + chkPedagio.setDisabled(false); + chkArredondarTaxaEmbarque.setDisabled(false); + chkArredondarTaxaEmbarque.setChecked(true); + paradaDiv.setVisible(false); + } + } + + public void onCheck$chkPedagio(CheckEvent ev) { + if (filtraPorPracaDePedagio) { + if (chkPedagio.isChecked()) { + casetaPeajeDiv.setVisible(true); + } else { + casetaPeajeDiv.setVisible(false); + listSelectedCasetaPeaje = new ArrayList(); + selectedCasetaPeajeList.clear(); + } + } + } + + public void onCheck$chkGerarTaxaDeEmbarquePorLocalidade(CheckEvent ev) + { + if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) + { + listSelectedParadas = new ArrayList(); + carregarParadas(); + chkTaxaEmbarque.setChecked(true); + chkTaxaEmbarque.setDisabled(true); + chkTarifa.setChecked(false); + chkTarifa.setDisabled(true); + chkSeguro.setChecked(false); + chkSeguro.setDisabled(true); + chkTipoSeguro.setDisabled(true); + chkPedagio.setChecked(false); + chkTipoSeguro.setChecked(false); + chkPedagio.setDisabled(true); + paradaDiv.setVisible(true); + } else + { + listSelectedParadas = new ArrayList(); + selectedParadasList.setData(listSelectedParadas); + chkTarifa.setDisabled(false); + chkTarifa.setChecked(true); + chkTaxaEmbarque.setDisabled(false); + chkTaxaEmbarque.setChecked(false); + chkSeguro.setDisabled(false); + chkTipoSeguro.setDisabled(false); + chkPedagio.setDisabled(false); + chkArredondarTaxaEmbarque.setDisabled(false); + chkArredondarTaxaEmbarque.setChecked(true); + paradaDiv.setVisible(false); + lsParada=null; + + } + } + + public void onClick$btnGenerarVigencia(Event ev) throws InterruptedException { + Boolean limparRutas = false; + cmbOrgaoConcedente.getValue(); + cmbEmpresa.getValue(); + + OrgaoConcedente orgaoConcedente = null; + + if (cmbOrgaoConcedente.getSelectedItem() != null) { + orgaoConcedente = ((OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue()); + } + + lsEmpresaSelected = Arrays.asList((Empresa) cmbEmpresa.getSelectedItem().getValue()); + + + if (orgaoConcedente == null) { + int resp = Messagebox.show( + Labels.getLabel("generarTarifaOrgaoController.MSG.gerarTodosOrgaos"), + Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), + Messagebox.YES | Messagebox.NO, Messagebox.QUESTION); + + if (resp == Messagebox.NO) { + return; + } + } + + if (listSelectedRutas == null || listSelectedRutas.isEmpty()) { + limparRutas = true; + if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { + lsRuta = rutaService.buscarRutasPorEmpresaOrgaoConcedenteParadaIds((Empresa) cmbEmpresa.getSelectedItem().getValue(), orgaoConcedente, converteListIdsEmArrayIds(retornarListParadaIds(listSelectedParadas))); + } else { + if(!listSelectedCasetaPeaje.isEmpty()) { + lsRuta = rutaService.buscarPorOrgaoEcasetaPeaje(orgaoConcedente, converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(listSelectedCasetaPeaje),(Empresa) cmbEmpresa.getSelectedItem().getValue()); + // orgao = null; + List lsRutaAux = new ArrayList(); + lsRutaAux.addAll(lsRuta); + for (Ruta r : lsRutaAux) { + if (r.getOrgaoConcedente().getIndicePeaje() == null) { + lsRuta.remove(r); + } + } + } + + } + listSelectedRutas = lsRuta; + + } else if (chkPedagio.isChecked() && !validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio()) { + return; + } + + if (!chkZerarTabela.isChecked()) { + try { + Usuario usuario = UsuarioLogado.getUsuarioLogado(); + log.info("INICIO DE GERAR TARIFA OFICIAL -- USUARIO: " + usuario.getUsuarioId()); + + if (chkTarifa.isChecked()) { + tarifaOficialService.gerarAtualizarTarifa(listSelectedRutas, orgaoConcedente, lsEmpresaSelected,converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(listSelectedCasetaPeaje)); + log.info("FIM DE GERAR TARIFA OFICIAL -- TARIFA"); + } + + boolean gerarTabelaZerada = !chkTarifa.isChecked(); + List lsParadaIds =null; + if (chkTaxaEmbarque.isChecked()) { + if(chkGerarTaxaDeEmbarquePorLocalidade.isChecked() && !listSelectedParadas.isEmpty()) { + lsParadaIds=retornarListParadaIds(listSelectedParadas); + } + tarifaOficialService.atualizarTaxaEmbarque(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), gerarTabelaZerada, lsEmpresaSelected,lsParadaIds); + + log.info("FIM DE GERAR TARIFA OFICIAL -- TAXA DE EMBARQUE"); + } + + if (chkSeguro.isChecked()) { + tarifaOficialService.atualizarSeguro(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), TipoSeguro.SEGURO); + } + + if (chkTipoSeguro.isChecked()) { + tarifaOficialService.atualizarSeguro(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), TipoSeguro.TPP); + log.info("FIM DE GERAR TARIFA OFICIAL -- SEGURO"); + } + + if (chkPedagio.isChecked()) { + if(listSelectedCasetaPeaje.isEmpty()) { + tarifaOficialService.atualizarPedagio(); + }else { + tarifaOficialService.atualizarPedagioPorListaDePracaDePagio(listSelectedCasetaPeaje, retornarEmpresaId()); + } + + log.info("FIM DE GERAR TARIFA OFICIAL -- PEDAGIO"); + } + + if (chkTipoSeguro.isChecked()) { + tarifaOficialService.atualizarSeguroTPP(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), TipoSeguro.TPP); + log.info("FIM DE GERAR TARIFA OFICIAL -- SEGURO OPCIONAL"); + } + + tarifaOficialService.aplicarArredondamentoTarifa(orgaoConcedente.getOrgaoConcedenteId(), chkArredondarTaxaEmbarque.isChecked()); + + long l = tarifaOficialService.obtenerCount(lsEmpresaSelected); + log.info("FIM DE GERAR TARIFA OFICIAL: -- USUARIO: " + usuario.getUsuarioId() + "Foram gerados " + l + " registros."); + + Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK", new Object[] { l }), + Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), + Messagebox.OK, Messagebox.INFORMATION); + + } catch (BusinessException e) { + log.error("ERROR AO GERAR TARIFA OFICIAL:", e); + Messagebox.show(e.getLocalizedMessage(), + Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), + Messagebox.OK, Messagebox.EXCLAMATION); + } + } else { + try { + tarifaOficialService.gerarAtualizarTabelaZerada(listSelectedRutas, orgaoConcedente.getOrgaoConcedenteId(), lsEmpresaSelected,null); + + Messagebox.show(Labels.getLabel("generarTarifaOrgaoController.MSG.suscribirOK"), + Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), + Messagebox.OK, Messagebox.INFORMATION); + } catch (BusinessException e) { + log.error("ERROR AO GERAR TARIFA OFICIAL:", e); + Messagebox.show(e.getLocalizedMessage(), + Labels.getLabel("indexController.mniGenerarTarifaOrgao.label"), + Messagebox.OK, Messagebox.EXCLAMATION); + } + } + if (limparRutas) { + listSelectedRutas.clear(); + } + } + + private Integer retornarEmpresaId() { + Empresa empresa = (Empresa) cmbEmpresa.getSelectedItem().getValue(); + return empresa.getEmpresaId(); + } + + public List getListSelectedRutas() { + return listSelectedRutas; + } + + public void setListSelectedRutas(List listSelectedRutas) { + this.listSelectedRutas = listSelectedRutas; + } + + public void onClick$btnAddRuta(Event ev) throws InterruptedException { + if (esperar) { + cmbRuta.setSelectedItem(null); + return; + } + if (cmbRuta.getSelectedItem() != null) { + listSelectedRutas.add((Ruta) cmbRuta.getSelectedItem().getValue()); + selectedRutasList.setData(listSelectedRutas); + cmbRuta.setSelectedItem(null); + if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { + carregarParadas(); + } + } + } + + public void onClick$btnRemoveRuta(Event ev) throws InterruptedException { + Ruta ruta = (Ruta) selectedRutasList.getSelected(); + listSelectedRutas.remove(ruta); + selectedRutasList.setData(listSelectedRutas); + if (chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { + carregarParadas(); + } + } + + + public void onClick$btnAddParada(Event ev) throws InterruptedException { + if (esperar) { + cmbParada.setSelectedItem(null); + return; + } + if (cmbParada.getSelectedItem() != null) { + listSelectedParadas.add((Parada) cmbParada.getSelectedItem().getValue()); + selectedParadasList.setData(listSelectedParadas); + cmbParada.setSelectedItem(null); + } + } + + public void onClick$btnRemovePArada(Event ev) throws InterruptedException { + Parada parada = (Parada) selectedParadasList.getSelected(); + listSelectedParadas.remove(parada); + selectedParadasList.setData(listSelectedParadas); + } + + + + public List getLsParada() { + return lsParada; + } + + + public void onSelect$cmbOrgaoConcedente(Event ev) { + onSelectEmpresaOrgaoConcedente(); + } + + public void onSelect$cmbEmpresa(Event ev) throws InterruptedException { + onSelectEmpresaOrgaoConcedente(); + } + + + + public void onSelectEmpresaOrgaoConcedente() { + Constraint constraint = cmbEmpresa.getConstraint(); + cmbEmpresa.setConstraint(""); + Empresa empresaSelected = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); + cmbEmpresa.setConstraint(constraint); + OrgaoConcedente orgaoSelected = cmbOrgaoConcedente.getSelectedItem() == null ? null : (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); + + esperar = true; + + lsRuta = rutaService.buscarRutasPorEmpresaOrgaoConcedente(empresaSelected, orgaoSelected); + + + BindingListModelList l = new BindingListModelList(lsRuta, true); + cmbRuta.setModel(l); + + + + int indexToRemove = 0; + boolean achou = false; + List indexList = new ArrayList(); + + for (final Ruta ruta : listSelectedRutas) { + if (orgaoSelected == null || orgaoSelected.getOrgaoConcedenteId() == -1 || ruta.getOrgaoConcedente().equals(orgaoSelected)) { + try { + ruta.getLsRutaEmpresa(); + } catch (LazyInitializationException e) { + ruta.setLsRutaEmpresa(rutaEmpresaService.obtenerPorRuta(ruta)); + } + for (RutaEmpresa rutaEmpresa : ruta.getLsRutaEmpresa()) { + if (empresaSelected == null || rutaEmpresa.getEmpresa().equals(empresaSelected)) { + achou = true; + } + } + } + if (!achou) { + indexList.add(indexToRemove); + } + indexToRemove++; + achou = false; + } + + for (Integer i : indexList) { + Ruta ruta = listSelectedRutas.get(i); + listSelectedRutas.remove(ruta); + } + if(chkGerarTaxaDeEmbarquePorLocalidade.isChecked()) { + carregarParadas(); + } + selectedRutasList.setData(listSelectedRutas); + cmbRuta.setSelectedItem(null); + esperar = false; + } + + private void carregarParadas() { + if (!listSelectedRutas.isEmpty()) { + lsParada = paradaService.obtenerOrigenPorListRutaIds(null, null, converteListIdsEmArrayIds(retornarListRutaIds(listSelectedRutas))); + } else { + if (lsRuta.isEmpty()) { + Constraint constraint = cmbEmpresa.getConstraint(); + cmbEmpresa.setConstraint(""); + Empresa empresaSelected = cmbEmpresa.getSelectedItem() == null ? null : (Empresa) cmbEmpresa.getSelectedItem().getValue(); + cmbEmpresa.setConstraint(constraint); + OrgaoConcedente orgaoSelected = cmbOrgaoConcedente.getSelectedItem() == null ? null : (OrgaoConcedente) cmbOrgaoConcedente.getSelectedItem().getValue(); + lsParada = paradaService.obtenerOrigenPorListRutaIds(orgaoSelected == null ? null : orgaoSelected.getOrgaoConcedenteId(), empresaSelected == null ? null : empresaSelected.getEmpresaId(), null); + } else { + lsParada = paradaService.obtenerOrigenPorListRutaIds(null, null, converteListIdsEmArrayIds(retornarListRutaIds(lsRuta))); + } + } + + + List listSelectedParadasAux = new ArrayList(); + listSelectedParadasAux.addAll(listSelectedParadas); + if(!listSelectedParadas.isEmpty()) { + for(Parada parada :listSelectedParadasAux ) { + if(!lsParada.contains(parada)) { + listSelectedParadas.remove(parada); + } + } + } + + BindingListModelList l = new BindingListModelList(lsParada, true); + cmbParada.setModel(l); + + + selectedParadasList.setData(listSelectedParadas); + } + + + private Integer[] converteListIdsEmArrayIds(List ids) { + Integer[] arrayIds = new Integer[ids.size()]; + arrayIds = ids.toArray(arrayIds); + return arrayIds; + } + + private List retornarListRutaIds(List lsRutasSelecionadas) { + List listRutasId = new ArrayList(); + for (Ruta r : lsRutasSelecionadas) { + listRutasId.add(r.getRutaId()); + } + + return listRutasId; + } + + + private List retornarListParadaIds(List lsParadassSelecionadas) { + List listParadasId = new ArrayList(); + for (Parada p : lsParadassSelecionadas) { + listParadasId.add(p.getParadaId()); + } + return listParadasId; + } + + + public void onClick$btnAddCasetaPeaje(Event ev) throws InterruptedException { + if (cmbCasetaPeaje.getSelectedItem() != null) { + listSelectedCasetaPeaje.add((CasetaPeaje) cmbCasetaPeaje.getSelectedItem().getValue()); + selectedCasetaPeajeList.setData(listSelectedCasetaPeaje); + cmbCasetaPeaje.setSelectedItem(null); + } + } + + public void onClick$btnRemoveCasetaPeaje(Event ev) throws InterruptedException { + CasetaPeaje casetaPeaje= (CasetaPeaje) selectedCasetaPeajeList.getSelected(); + listSelectedCasetaPeaje.remove(casetaPeaje); + selectedCasetaPeajeList.setData(listSelectedCasetaPeaje); + } + + + private Boolean validaSeTodasAsRutasPossuiPeloMenosUmaSecuenciaComApracaDePedagio() throws InterruptedException { + if (!listSelectedCasetaPeaje.isEmpty() && !listSelectedRutas.isEmpty()) { + List lsRutaAuxiliar = new ArrayList(); + retornarApenasRutaQuePossuiSecuenciasComAsPracas(lsRutaAuxiliar); + for (Ruta ruta : listSelectedRutas) { + if (!lsRutaAuxiliar.contains(ruta)) { + Messagebox.show(Labels.getLabel("calcularPeajeController.MSG.linhaSemPracaDePedagio", new Object[] { ruta }), + Labels.getLabel("indexController.mniCalculoPeaje.label"), Messagebox.OK, Messagebox.ERROR); + return false; + } + } + } + return true; + } + + private void retornarApenasRutaQuePossuiSecuenciasComAsPracas(List lsRutaAuxiliar) { + List listSelectedRutasAux = recarregarAsRutasComBanco(listSelectedRutas); + for (CasetaPeaje casetaPeaje : listSelectedCasetaPeaje) { + for (Ruta r : listSelectedRutasAux) { + if (!r.getRutaSecuenciaList().isEmpty()) { + Boolean isRutaSecuencia = false; + for (RutaSecuencia rutaSecuencia : r.getRutaSecuenciaList()) { + if (isRutaSecuencia) + break; + if (rutaSecuencia.getActivo()) { + for (RutaCaseta rutaCaseta : rutaSecuencia.getLsRutaCase()) { + if (rutaCaseta.getActivo() && rutaCaseta.getCasetaPeaje().getCasetaPeajeId().intValue() == casetaPeaje.getCasetaPeajeId().intValue()) { + lsRutaAuxiliar.add(r); + isRutaSecuencia = true; + break; + } + } + } + } + } + } + } + } + + + List recarregarAsRutasComBanco(List lsRutasSelecionadas){ + List lsRutaIds=retornarListRutaIds(lsRutasSelecionadas); + Integer[] arrayDeRutaIds = converteListIdsEmArrayIds(lsRutaIds); + return rutaService.buscarPorIds(arrayDeRutaIds); + } + + + private Integer[] converterLiistDeCasetaPeajeEmArrayDeCasetaPeaje(List lsCasetaPeaje) { + if(!lsCasetaPeaje.isEmpty()) { + return converteListIdsEmArrayIds(retornarListCasetaPeajeIds(lsCasetaPeaje)); + } + return null; + } + + + private List retornarListCasetaPeajeIds(List lsCasetaPeaje) { + List listCasetaPeaje= new ArrayList(); + for (CasetaPeaje c : lsCasetaPeaje) { + listCasetaPeaje.add(c.getCasetaPeajeId()); + } + return listCasetaPeaje; + } + + + public List getLsCasetaPeaje() { + return lsCasetaPeaje; + } + + public void setLsCasetaPeaje(List lsCasetaPeaje) { + this.lsCasetaPeaje = lsCasetaPeaje; + } + + private Boolean buscarContantefiltrarPorPracaDePedagio() { + Constante constante = constanteService.buscarPorNomeConstante(FILTRAR_POR_PRACA_DE_PEDAGIO); + if (constante != null) { + if(constante.getValorconstante().equalsIgnoreCase("true")) { + return true; + } + } + return false; + + } + +} 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 ec0b7d3ed..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,8 +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; @@ -58,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 a2bda58df..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,8 +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; @@ -191,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 d5185a5bb..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,8 +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; @@ -90,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 ebf6c69de..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,8 +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; @@ -88,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 51074ca2e..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,8 +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; @@ -196,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 e8a21fe48..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,8 +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; @@ -97,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 2c5b23284..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,8 +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; @@ -142,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 ced0123e3..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,8 +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; @@ -121,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 10d986309..3bc129e08 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/IPValidatorUtileria.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/IPValidatorUtileria.java @@ -10,12 +10,13 @@ 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 bb46a0b75..0ebd87b9a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/InputMessageBox.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/InputMessageBox.java @@ -2,8 +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; @@ -13,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 8906410bb..9221c0ff9 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyAppInit.java @@ -11,8 +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; @@ -51,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 593145b4d..dbd71298e 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEmpresa.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxEmpresa.java @@ -3,8 +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; @@ -22,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 7264c71e6..95e6f80f0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxMoeda.java @@ -2,8 +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; @@ -16,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 4db678128..9dba1b88f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParada.java @@ -7,8 +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; @@ -29,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 8742922c5..c4911c73a 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParadaCve.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyComboboxParadaCve.java @@ -4,12 +4,11 @@ */ package com.rjconsultores.ventaboletos.web.utilerias; -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; @@ -20,13 +19,16 @@ import org.zkoss.zkplus.databind.BindingListModelList; import org.zkoss.zkplus.spring.SpringUtil; import org.zkoss.zul.Combobox; +import com.rjconsultores.ventaboletos.entidad.Parada; +import com.rjconsultores.ventaboletos.service.ParadaService; + /** * * @author Administrador */ 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 b1459e2ef..d1e300be1 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyGenericForwardComposer.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyGenericForwardComposer.java @@ -6,8 +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; @@ -22,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 a4e7f3687..a7fa6ecef 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorCliente.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/MyLabelLocatorCliente.java @@ -11,8 +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; /** @@ -21,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 a39229d45..b14f7fcea 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; /** @@ -19,7 +20,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 3bde84d86..89f0159b0 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/PantallaUtileria.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/PantallaUtileria.java @@ -2,8 +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; @@ -15,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/Version.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/Version.java index 92379e4d4..f0ed93f06 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/Version.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/Version.java @@ -6,11 +6,11 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Version { - private static Logger log = LoggerFactory.getLogger(Version.class); + private static Logger log = LogManager.getLogger(Version.class); public static String readVersion() { String version = ""; 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 12a1c8dca..c8dc0ba97 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/api/ApiCallRunnable.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/api/ApiCallRunnable.java @@ -17,8 +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; @@ -30,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 1733834b8..eb99ac42f 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/DefaultItemMenuSistema.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/menu/DefaultItemMenuSistema.java @@ -3,8 +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; @@ -16,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 8eeca20bf..aa2e7a2c0 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,8 +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; @@ -14,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 507be6d43..c4eec2bc1 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,8 +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; @@ -14,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 f607c63be..f08da2883 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,8 +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; @@ -19,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 4f957ea8c..a86c4fe9c 100644 --- a/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java +++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/paginacion/PagedListWrapper.java @@ -4,14 +4,13 @@ */ package com.rjconsultores.ventaboletos.web.utilerias.paginacion; -import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; -import com.trg.search.SearchResult; 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.commons.lang.StringUtils; +import org.apache.logging.log4j.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; @@ -24,6 +23,9 @@ import org.zkoss.zul.Listheader; import org.zkoss.zul.Paging; import org.zkoss.zul.event.PagingEvent; +import com.rjconsultores.ventaboletos.web.utilerias.MyListbox; +import com.trg.search.SearchResult; + /** * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
* Helper class for getting a paged record list that can be sorted by DB.
@@ -47,7 +49,7 @@ import org.zkoss.zul.event.PagingEvent; public class PagedListWrapper implements Serializable { private static final long serialVersionUID = -7399762307122148637L; - private static final Logger log = 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 f35b6567c..8c8b85488 100644 --- a/tests/com/rjconsultores/tests/SecurityEmpresaTokenTest.java +++ b/tests/com/rjconsultores/tests/SecurityEmpresaTokenTest.java @@ -4,16 +4,16 @@ import static org.junit.Assert.fail; import java.time.Duration; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.apache.log4j.Logger; - import com.rjconsultores.ventaboletos.web.utilerias.security.SecurityEmpresaToken; public class SecurityEmpresaTokenTest { - private static final Logger log = Logger.getLogger(SecurityEmpresaTokenTest.class); + private static final Logger log = LogManager.getLogger(SecurityEmpresaTokenTest.class); @Before public void initApplicationContext() { diff --git a/web/WEB-INF/jboss-deployment-structure.xml b/web/WEB-INF/jboss-deployment-structure.xml index 07b4780c7..09b96d397 100644 --- a/web/WEB-INF/jboss-deployment-structure.xml +++ b/web/WEB-INF/jboss-deployment-structure.xml @@ -1,8 +1,7 @@ - + - \ No newline at end of file