fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fixes bug #AL-3470' (!393) from AL-3470 into master 

Reviewed-on: adm/VentaBoletosAdm#393
Reviewed-by: Gleison da Cruz <gleison.cruz@totvs.com.br>
master
pinheiro 2024-02-20 20:05:31 +00:00
parent 3132dc5f7d e609a3e2a1
commit b9535949ff
415 changed files with 2714 additions and 2639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.51.0</version>
<version>1.52.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.38.0</modelWeb.version>
<flyway.version>1.28.0</flyway.version>
<modelWeb.version>1.39.0</modelWeb.version>
<flyway.version>1.29.0</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
@ -83,37 +83,51 @@
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>IntegracaoReceitaDespesa</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>WSTotvs</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>WSAG</artifactId>
<version>1.2.0</version>
<version>1.3.0</version>
<exclusions>
<exclusion>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ojdbc14</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>Auditador</artifactId>
<version>1.1.1</version>
<version>1.2.0</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>GeneradorBoletosCNAB</artifactId>
<version>1.6.1</version>
<version>1.7.0</version>
</dependency>
<dependency>

6
src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java
View File

@ -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 {

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java
View File

@ -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<Object> listdata = null;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java
View File

@ -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<RelatorioAgenciaFechamentoAntigoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamentoNovo.java
View File

@ -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<RelatorioAgenciaFechamentoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java
View File

@ -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<ItemRelatorioFinanceiro> listdata = null;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java
View File

@ -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<ItemRelatorioVoucher> listdata = null;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java
View File

@ -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<ItemRelatorioVoucher> listdata = null;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java
View File

@ -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<RelatorioBoletoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java
View File

@ -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<RelatorioCaixaOrgaoConcedenteBean> lsDadosRelatorio;
private static Logger log = Logger.getLogger(RelatorioCaixaOrgaoConcedente.class);
private static Logger log = LogManager.getLogger(RelatorioCaixaOrgaoConcedente.class);
public RelatorioCaixaOrgaoConcedente(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCarteirinha.java
View File

@ -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 }

2
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java
View File

@ -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<RelatorioDepositoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java
View File

@ -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<RelatorioDepositosDetalhadosBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java
View File

@ -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<RelatorioDepositoBean> lsDadosRelatorio;

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDesempenhoPorLinha.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEmpresaCorrida.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java
View File

@ -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<FinanceiroAnalitico> listdata = null;
@SuppressWarnings("unchecked")

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java
View File

@ -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<FinanceiroSintetico> listdata = null;
@SuppressWarnings("unchecked")

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java
View File

@ -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<FolioRMD> listdata = null;
private static final String DATE_FORMAT_FISCAL = "yyyyMMdd";

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java
View File

@ -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<RelatorioGratuidadeAGERBean> lsDadosRelatorio;
private static Logger log = Logger.getLogger(RelatorioGratuidadeAGER.class);
private static Logger log = LogManager.getLogger(RelatorioGratuidadeAGER.class);
public RelatorioGratuidadeAGER(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java
View File

@ -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<RelatorioGratuidadeARTESPBean> lsDadosRelatorio;
private static Logger log = Logger.getLogger(RelatorioGratuidadeARTESP.class);
private static Logger log = LogManager.getLogger(RelatorioGratuidadeARTESP.class);
public RelatorioGratuidadeARTESP(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioImpressaoPosterior.java
View File

@ -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<RelatorioImpressaoPosteriorBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java
View File

@ -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<RelatorioIndiceIRKBean> lsDadosRelatorio;
private static Logger log = Logger.getLogger(RelatorioIndiceIRK.class);
private static Logger log = LogManager.getLogger(RelatorioIndiceIRK.class);
/**

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java
View File

@ -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<RelatorioLinhasHorarioBean> lsDadosRelatorio;
private static String CONSTANTE_GRATUIDADE_CRIANCA;
private BigDecimal CENTO = BigDecimal.TEN.multiply(BigDecimal.TEN);

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java
View File

@ -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<RelatorioLinhasHorarioBean> lsDadosRelatorio;
private static String CONSTANTE_GRATUIDADE_CRIANCA;

8
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java
View File

@ -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<RelatorioLinhasHorarioBean> lsDadosRelatorio;
private static String CONSTANTE_GRATUIDADE_CRIANCA;

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java
View File

@ -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<RelatorioMensalDAERBean> lsDadosRelatorio;
private static Logger log = Logger.getLogger(RelatorioMensalDAER.class);
private static Logger log = LogManager.getLogger(RelatorioMensalDAER.class);
/**
* @param parametros

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java
View File

@ -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<ItemRelatorioMovimentoEstoque> list = null;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java
View File

@ -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<RelatorioOperacionalFinanceiroBean> lsDadosRelatorio;
private static Logger log = Logger.getLogger(RelatorioOperacionalFinanceiro.class);
private static Logger log = LogManager.getLogger(RelatorioOperacionalFinanceiro.class);
public RelatorioOperacionalFinanceiro(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java
View File

@ -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<RelatorioOrigemDestinoBean> listaBean = new ArrayList<RelatorioOrigemDestinoBean>();

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java
View File

@ -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<RelatorioPassagensAGERBean> lsDadosRelatorio;
private static Logger log = Logger.getLogger(RelatorioPassagensAGER.class);
private static Logger log = LogManager.getLogger(RelatorioPassagensAGER.class);
public RelatorioPassagensAGER(Map<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

4
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java
View File

@ -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 {

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java
View File

@ -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<RelatorioSegundaViaBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java
View File

@ -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<RelatorioSegundaViaBean> lsDadosRelatorio;

7
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java
View File

@ -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<RelatorioSegundaViaSeguroOpcionalBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java
View File

@ -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<String, Object> parametros, Connection conexao) throws Exception {
super(parametros, conexao);

10
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java
View File

@ -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<PacoteVoucher> lsPacoteVoucher;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java
View File

@ -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<RelatorioVendasCartoesBean> list = null;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java
View File

@ -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<RelatorioVendasCartoesBean> list = null;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java
View File

@ -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<RelatorioVendasComissaoBean> lsDadosRelatorio;
private List<RelatorioVendasComissaoCancelamentoBean> lsDadosRelatorioCancelamento;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java
View File

@ -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<RelatorioVendasComissaoBean> lsDadosRelatorio;
private List<RelatorioVendasComissaoCancelamentoBean> lsDadosRelatorioCancelamento;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java
View File

@ -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<RelatorioVendasConexaoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java
View File

@ -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<RelatorioVendasConexaoRutaBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java
View File

@ -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<RelatorioVendasPacotesDetalhadoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java
View File

@ -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");

5
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasParcelamento.java
View File

@ -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<RelatorioVendasParcelamentoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java
View File

@ -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<RelatorioVendasRequisicaoBean> lsDadosRelatorio;

6
src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java
View File

@ -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;

9
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java
View File

@ -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";

5
src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperador.java
View File

@ -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 })

5
src/java/com/rjconsultores/ventaboletos/rest/ConsultarOperadorDetalhesCorrida.java
View File

@ -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 })

5
src/java/com/rjconsultores/ventaboletos/rest/SincronizarOperador.java
View File

@ -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 })

7
src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java
View File

@ -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 })

5
src/java/com/rjconsultores/ventaboletos/rest/ValidaSenhaInstalacao.java
View File

@ -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 })

9
src/java/com/rjconsultores/ventaboletos/rest/pricing/AlteraPricingRS.java
View File

@ -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 })

6
src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java
View File

@ -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;

5
src/java/com/rjconsultores/ventaboletos/rest/service/ConsultarOperadorService.java
View File

@ -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) {

5
src/java/com/rjconsultores/ventaboletos/rest/service/SincronizarOperadorService.java
View File

@ -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 {

6
src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java
View File

@ -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;

2
src/java/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties
View File

@ -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

7
src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridCombinacionTramoRutaCoeficiente.java
View File

@ -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<SecuenciaRutaTramoCoeficienteVO>();

6
src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramo.java
View File

@ -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() {

6
src/java/com/rjconsultores/ventaboletos/web/gui/componente/esquemaoperacional/GridRutaTramoCoeficiente.java
View File

@ -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<SecuenciaRutaTramoCoeficienteVO>();

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeExportacaoController.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/bpe/BusquedaBpeRdiController.java
View File

@ -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;

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaConfTotemController.java
View File

@ -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

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaHotelController.java
View File

@ -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<Hotel> plwHotel;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/BusquedaPacoteConvenioController.java
View File

@ -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<PacoteConvenio> plwPacoteConvenio;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarArticuloController.java
View File

@ -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;

30
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAsociacionClaseServicioMarcaController.java
View File

@ -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<ClaseServicio> getLsClaseServicios() {
return lsClaseServicios;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarAutorizacaoUsoSerieEmbarcadaController.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCategoriaController.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCiudadController.java
View File

@ -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<Estado> 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;

7
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarClaseServicioController.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarColoniaController.java
View File

@ -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;

8
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemController.java
View File

@ -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<SistemaEnum> 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 {

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarConfTotemVentaRapidaController.java
View File

@ -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

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaBancariaEmpresaController.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarContaMDController.java
View File

@ -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;

18
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCuponConvenioController.java
View File

@ -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<TipoConvenio> tipoConvenioList;
private static Logger log = Logger.getLogger(EditarCuponConvenioController.class);
private static Logger log = LogManager.getLogger(EditarCuponConvenioController.class);
public Combobox getCmbTipoConvenio() {
return cmbTipoConvenio;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCursoController.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomController.java
View File

@ -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<SistemaEnum> lsSistemaEnum;
private List<CustomTipo> 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 {

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarCustomUploadArquivoController.java
View File

@ -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 {

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDetDiagramaAutobusController.java
View File

@ -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;

6
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarDispositivoVendaEmbarcadaController.java
View File

@ -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 {

9
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpleadoController.java
View File

@ -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;

5
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaController.java
View File

@ -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

Some files were not shown because too many files have changed in this diff Show More