Merge pull request 'AL-3470' (!316) from AL-3470 into master

Reviewed-on: adm/VentaBoletosAdm#316

pom.xml

@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.32.3</version>
+	<version>1.33.0</version>
 	<packaging>war</packaging>  
   
 	<properties>
-		<modelWeb.version>1.23.2</modelWeb.version>
+		<modelWeb.version>1.24.0</modelWeb.version>
-		<flyway.version>1.19.1</flyway.version>
+		<flyway.version>1.20.0</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
@@ -95,7 +95,7 @@
 		<dependency>
 			<groupId>br.com.rjconsultores</groupId>
 			<artifactId>WSAG</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>br.com.rjconsultores</groupId>
@@ -270,6 +270,12 @@
 		    <groupId>net.sourceforge.jexcelapi</groupId>
 		    <artifactId>jxl</artifactId>
 		    <version>2.6.12</version>
+		    <exclusions>
+		    	<exclusion>
+					<groupId>log4j</groupId>
+            		<artifactId>log4j</artifactId>
+				</exclusion>
+		    </exclusions>
 		</dependency>
 		
 		<dependency>
@@ -277,7 +283,33 @@
 			<artifactId>colorbox</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-
+ 		<dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.21.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.21.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.21.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-1.2-api</artifactId>
+            <version>2.21.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-jcl</artifactId>
+            <version>2.21.1</version>
+        </dependency>
 	</dependencies>
 	
 </project>

src/java/com/rjconsultores/ventaboletos/filters/AuthenticationPricingRS.java

@@ -13,7 +13,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.constantes.ConstantesFuncionSistema;
 import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 @WebFilter(filterName = "authenticationPricingRS", urlPatterns = "/rest/pricing/*")
 public class AuthenticationPricingRS implements Filter {
 	
-	private static Logger log = Logger.getLogger(AuthenticationPricingRS.class);
+	private static Logger log = LogManager.getLogger(AuthenticationPricingRS.class);
 
 	@Override
 	public void init(FilterConfig filterConfig) throws ServletException {

src/java/com/rjconsultores/ventaboletos/relatorios/impl/ReciboEntregaMovimentacao.java

@@ -5,7 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -14,7 +15,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class ReciboEntregaMovimentacao extends Relatorio {
 
-	private static Logger log = Logger.getLogger(ReciboEntregaMovimentacao.class);
+	private static Logger log = LogManager.getLogger(ReciboEntregaMovimentacao.class);
 	List<Object> listdata = null;
 
 	

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAgenciaFechamento.java

@@ -11,7 +11,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.RelatorioAgenciaFechamentoAntigoBean;
@@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public abstract class RelatorioAgenciaFechamento extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioAgenciaFechamento.class);
+	private static Logger log = LogManager.getLogger(RelatorioAgenciaFechamento.class);
 	
 	protected List<RelatorioAgenciaFechamentoAntigoBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoFinanceiro.java

@@ -9,7 +9,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
@@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioAnaliticoFinanceiro extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioAnaliticoFinanceiro.class);
+	private static Logger log = LogManager.getLogger(RelatorioAnaliticoFinanceiro.class);
 
 	List<ItemRelatorioFinanceiro> listdata = null;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucher.java

@@ -8,7 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
@@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioAnaliticoVoucher extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioAnaliticoVoucher.class);
+	private static Logger log = LogManager.getLogger(RelatorioAnaliticoVoucher.class);
 
 	List<ItemRelatorioVoucher> listdata = null;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAnaliticoVoucherCancelados.java

@@ -8,7 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
@@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioAnaliticoVoucherCancelados extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioAnaliticoVoucherCancelados.class);
+	private static Logger log = LogManager.getLogger(RelatorioAnaliticoVoucherCancelados.class);
 
 	List<ItemRelatorioVoucher> listdata = null;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiro.java

@@ -11,7 +11,8 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -21,7 +22,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioAproveitamentoFinanceiro extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioAproveitamentoFinanceiro.class);
+	private static Logger log = LogManager.getLogger(RelatorioAproveitamentoFinanceiro.class);
 
 	public RelatorioAproveitamentoFinanceiro(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioAproveitamentoFinanceiroTrecho.java

@@ -16,7 +16,8 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -28,7 +29,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioAproveitamentoFinanceiroTrecho extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioAproveitamentoFinanceiroTrecho.class);
+	private static Logger log = LogManager.getLogger(RelatorioAproveitamentoFinanceiroTrecho.class);
 
 	public RelatorioAproveitamentoFinanceiroTrecho(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioBoletos.java

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioBoletos extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioBoletos.class);
+	private static Logger log = LogManager.getLogger(RelatorioBoletos.class);
 
 	private List<RelatorioBoletoBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioCaixaOrgaoConcedente.java

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -20,7 +21,7 @@ public class RelatorioCaixaOrgaoConcedente extends Relatorio {
 
 	private static final int TODOS = -1;
 	private List<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);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioComissaoSintetico.java

@@ -18,7 +18,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.negocio.CalculoImposto;
@@ -36,7 +37,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioComissaoSintetico extends Relatorio  {
 	
 
-private  Logger log;
+private static final Logger log = LogManager.getLogger(RelatorioComissaoSintetico.class);;
 private List<RelatorioComissaoSinteticoBean> lsDadosRelatorio;
 private LinkedHashMap<String, LinkedHashMap<String, Object>> mapCacheConfigComissao;
 private Set<PuntoVenta> pontoVendaConfiguracao; 
@@ -45,7 +46,7 @@ private Set<PuntoVenta> pontoVendaConfiguracao;
 	
 	public RelatorioComissaoSintetico(Map<String, Object> parametros, Connection conexao)  throws Exception {
 		super(parametros, conexao);
-		log = Logger.getLogger(RelatorioComissaoSintetico.class);
+		
 		CalculoImposto.limpaCache();
 		this.mapCacheConfigComissao = new LinkedHashMap<String, LinkedHashMap<String, Object>>();
 		

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositos.java

@@ -8,7 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioDepositos extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioDepositos.class);
+	private static Logger log = LogManager.getLogger(RelatorioDepositos.class);
 
 	private List<RelatorioDepositoBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosDetalhado.java

@@ -12,7 +12,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
@@ -28,7 +29,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
  */
 public class RelatorioDepositosDetalhado extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioDepositosDetalhado.class);
+	private static Logger log = LogManager.getLogger(RelatorioDepositosDetalhado.class);
 
 	private List<RelatorioDepositosDetalhadosBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDepositosNovo.java

@@ -11,7 +11,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioDepositosNovo extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioDepositosNovo.class);
+	private static Logger log = LogManager.getLogger(RelatorioDepositosNovo.class);
 
 	private List<RelatorioDepositoBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetes.java

@@ -10,7 +10,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
@@ -29,7 +30,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioDevolucaoBilhetes extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetes.class);
+	private static Logger log = LogManager.getLogger(RelatorioDevolucaoBilhetes.class);
 
 	public RelatorioDevolucaoBilhetes(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesConsolidado.java

@@ -8,7 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
@@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioDevolucaoBilhetesConsolidado extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetesConsolidado.class);
+	private static Logger log = LogManager.getLogger(RelatorioDevolucaoBilhetesConsolidado.class);
 
 	public RelatorioDevolucaoBilhetesConsolidado(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioDevolucaoBilhetesFinanceiro.java

@@ -8,7 +8,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Estado;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
@@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioDevolucaoBilhetesFinanceiro extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioDevolucaoBilhetesFinanceiro.class);
+	private static Logger log = LogManager.getLogger(RelatorioDevolucaoBilhetesFinanceiro.class);
 
 	public RelatorioDevolucaoBilhetesFinanceiro(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroAnalitico.java

@@ -10,7 +10,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
@@ -25,7 +26,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioFinanceiroAnalitico extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioFinanceiroAnalitico.class);
+	private static Logger log = LogManager.getLogger(RelatorioFinanceiroAnalitico.class);
 	List<FinanceiroAnalitico> listdata = null;
 
 	@SuppressWarnings("unchecked")

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFinanceiroSintetico.java

@@ -11,7 +11,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estado;
@@ -28,7 +29,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioFinanceiroSintetico extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioFinanceiroSintetico.class);
+	private static Logger log = LogManager.getLogger(RelatorioFinanceiroSintetico.class);
 	List<FinanceiroSintetico> listdata = null;
 
 	@SuppressWarnings("unchecked")

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioFolioRmd.java

@@ -9,7 +9,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Aidf;
 import com.rjconsultores.ventaboletos.entidad.Empresa;
@@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioFolioRmd extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioFolioRmd.class);
+	private static Logger log = LogManager.getLogger(RelatorioFolioRmd.class);
 	List<FolioRMD> listdata = null;
 	private static final String DATE_FORMAT_FISCAL = "yyyyMMdd";
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeAGER.java

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioGratuidadeAGER extends Relatorio {
 
 	private List<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);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioGratuidadeARTESP.java

@@ -9,7 +9,8 @@ import java.util.Map;
 
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioGratuidadeARTESP extends Relatorio {
 
 	private List<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);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioIndiceIRK.java

@@ -15,7 +15,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
@@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioIndiceIRK extends Relatorio {
 
 	private List<RelatorioIndiceIRKBean> lsDadosRelatorio;
-	private static Logger log = Logger.getLogger(RelatorioIndiceIRK.class);
+	private static Logger log = LogManager.getLogger(RelatorioIndiceIRK.class);
 	
 
 	/**

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorario.java

@@ -13,7 +13,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Corrida;
 import com.rjconsultores.ventaboletos.entidad.Empresa;
@@ -31,7 +32,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 @SuppressWarnings({"unused", "unchecked"})
 public class RelatorioLinhasHorario extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioLinhasHorario.class);
+	private static Logger log = LogManager.getLogger(RelatorioLinhasHorario.class);
 	private List<RelatorioLinhasHorarioBean> lsDadosRelatorio;
 	private static String CONSTANTE_GRATUIDADE_CRIANCA;
 	private BigDecimal CENTO = BigDecimal.TEN.multiply(BigDecimal.TEN);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimpData.java

@@ -13,7 +13,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.web.servlet.dsp.action.If;
 
 import com.rjconsultores.ventaboletos.entidad.Corrida;
@@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 @SuppressWarnings({"unused", "unchecked"})
 public class RelatorioLinhasHorarioSimpData extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioLinhasHorarioSimpData.class);
+	private static Logger log = LogManager.getLogger(RelatorioLinhasHorarioSimpData.class);
 	private List<RelatorioLinhasHorarioBean> lsDadosRelatorio;
 	private static String CONSTANTE_GRATUIDADE_CRIANCA;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioLinhasHorarioSimplificado.java

@@ -13,7 +13,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.web.servlet.dsp.action.If;
 
 import com.rjconsultores.ventaboletos.entidad.Corrida;
@@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 @SuppressWarnings({"unused", "unchecked"})
 public class RelatorioLinhasHorarioSimplificado extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioLinhasHorarioSimplificado.class);
+	private static Logger log = LogManager.getLogger(RelatorioLinhasHorarioSimplificado.class);
 	private List<RelatorioLinhasHorarioBean> lsDadosRelatorio;
 	private static String CONSTANTE_GRATUIDADE_CRIANCA;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMensalDAER.java

@@ -11,7 +11,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida;
@@ -25,7 +26,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioMensalDAER extends Relatorio {
 
 	private List<RelatorioMensalDAERBean> lsDadosRelatorio;
-	private static Logger log = Logger.getLogger(RelatorioMensalDAER.class);
+	private static Logger log = LogManager.getLogger(RelatorioMensalDAER.class);
 
 	/**
 	 * @param parametros

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentacaoEstoque.java

@@ -6,7 +6,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -17,7 +18,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioMovimentacaoEstoque extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioMovimentacaoEstoque.class);
+	private static Logger log = LogManager.getLogger(RelatorioMovimentacaoEstoque.class);
 
 	List<ItemRelatorioMovimentoEstoque> list = null;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioMovimentosAtraso.java

@@ -16,7 +16,8 @@ import java.util.Set;
 import java.util.TreeSet;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -29,7 +30,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioMovimentosAtraso extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioMovimentosAtraso.class);
+	private static Logger log = LogManager.getLogger(RelatorioMovimentosAtraso.class);
 	private Integer empresaId;
 	private Integer puntoventaId;
 	private Date dataInicial;

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoBilhetes.java

@@ -9,7 +9,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioObservacaoBilhetes extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioObservacaoBilhetes.class);
+	private static Logger log = LogManager.getLogger(RelatorioObservacaoBilhetes.class);
 	private Integer empresaId;
 	private Integer puntoventaId;
 	private Date dataInicial;

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoConferenciaMovimento.java

@@ -9,7 +9,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioObservacaoConferenciaMovimento extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioObservacaoConferenciaMovimento.class);
+	private static Logger log = LogManager.getLogger(RelatorioObservacaoConferenciaMovimento.class);
 	private Integer empresaId;
 	private Integer puntoventaId;
 	private Date dataInicial;

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioObservacaoEventosFinanceiros.java

@@ -9,7 +9,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -20,7 +21,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioObservacaoEventosFinanceiros extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioObservacaoEventosFinanceiros.class);
+	private static Logger log = LogManager.getLogger(RelatorioObservacaoEventosFinanceiros.class);
 	private Integer empresaId;
 	private Integer puntoventaId;
 	private Date dataInicial;

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOperacionalFinanceiro.java

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioOperacionalFinanceiro extends Relatorio {
 
 	private List<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);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioOrigemDestino.java

@@ -13,7 +13,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Constante;
 import com.rjconsultores.ventaboletos.entidad.EsquemaCorrida;
@@ -30,7 +31,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioOrigemDestino extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioOrigemDestino.class);
+	private static Logger log = LogManager.getLogger(RelatorioOrigemDestino.class);
 	
 	private static String CONSTANTE_GRATUIDADE_CRIANCA;
 	private List<RelatorioOrigemDestinoBean> listaBean = new ArrayList<RelatorioOrigemDestinoBean>();

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPassagensAGER.java

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 public class RelatorioPassagensAGER extends Relatorio {
 
 	private List<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);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioPdfAndExcel.java

@@ -10,7 +10,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.zul.Filedownload;
 import org.zkoss.zul.Listcell;
 import org.zkoss.zul.Listhead;
@@ -56,7 +57,7 @@ import net.sf.jasperreports.engine.type.WhenNoDataTypeEnum;
 
 public class RelatorioPdfAndExcel {
 	
-//	private static Logger log = Logger.getLogger(RelatorioDispositivoEmbarcada.class);
+//	private static Logger log = LogManager.getLogger(RelatorioDispositivoEmbarcada.class);
 	public MyListbox dispositivoVendaEmbarcadaList;
 	
 	public RelatorioPdfAndExcel(final MyListbox dispositivoVendaEmbarcadaList) throws Exception {

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaVia.java

@@ -11,7 +11,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioSegundaVia extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioSegundaVia.class);
+	private static Logger log = LogManager.getLogger(RelatorioSegundaVia.class);
 	private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 	private List<RelatorioSegundaViaBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaBoleto.java

@@ -11,7 +11,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioSegundaViaBoleto extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioSegundaVia.class);
+	private static Logger log = LogManager.getLogger(RelatorioSegundaVia.class);
 	private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 	private List<RelatorioSegundaViaBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioSegundaViaSeguroOpcional.java

@@ -11,7 +11,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioSegundaViaSeguroOpcional extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioSegundaViaSeguroOpcional.class);
+	private static Logger log = LogManager.getLogger(RelatorioSegundaViaSeguroOpcional.class);
 	private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 	private List<RelatorioSegundaViaSeguroOpcionalBean> lsDadosRelatorio;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaEmbarcada.java

@@ -9,7 +9,8 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes.FiltroEnviadosSefaz;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.ArrayDataSource;
@@ -32,7 +33,7 @@ public class RelatorioVendaEmbarcada extends Relatorio {
 	private Boolean quebraSequencia;
 	private Boolean ultimoBpe;
 
-	private static Logger log = Logger.getLogger(RelatorioVendaEmbarcada.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendaEmbarcada.class);
 
 	public RelatorioVendaEmbarcada(Map<String, Object> parametros, Connection conexao) throws Exception {
 		super(parametros, conexao);

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendaPacoteVoucher.java

@@ -12,7 +12,8 @@ import java.util.Map;
 import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes;
 import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe;
@@ -26,7 +27,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.NamedParameterStatement;
 
 public class RelatorioVendaPacoteVoucher extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendaPacoteVoucher.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendaPacoteVoucher.class);
 
 	private List<PacoteVoucher> lsPacoteVoucher;
 	

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoes.java

@@ -8,7 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estacion;
@@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasCartoes extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioVendasCartoes.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasCartoes.class);
 
 	List<RelatorioVendasCartoesBean> list = null;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasCartoesAlternativo.java

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.entidad.Empresa;
 import com.rjconsultores.ventaboletos.entidad.Estacion;
@@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasCartoesAlternativo extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioVendasCartoesAlternativo.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasCartoesAlternativo.class);
 
 	List<RelatorioVendasCartoesBean> list = null;
 

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissao.java

@@ -10,7 +10,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
@@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasComissao extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendasComissao.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasComissao.class);
 
 	private List<RelatorioVendasComissaoBean> lsDadosRelatorio;
 	private List<RelatorioVendasComissaoCancelamentoBean> lsDadosRelatorioCancelamento;

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasComissaoEstavel.java

@@ -10,7 +10,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.constantes.Constantes;
 import com.rjconsultores.ventaboletos.entidad.PuntoVenta;
@@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasComissaoEstavel extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendasComissaoEstavel.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasComissaoEstavel.class);
 
 	private List<RelatorioVendasComissaoBean> lsDadosRelatorio;
 	private List<RelatorioVendasComissaoCancelamentoBean> lsDadosRelatorioCancelamento;

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexao.java

@@ -8,7 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasConexao extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendasConexao.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasConexao.class);
 
 	private List<RelatorioVendasConexaoBean> lsDadosRelatorio;
 	

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasConexaoRuta.java

@@ -10,7 +10,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -22,7 +23,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasConexaoRuta extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendasConexaoRuta.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasConexaoRuta.class);
 
 	private List<RelatorioVendasConexaoRutaBean> lsDadosRelatorio;
 	

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesBoletos.java

@@ -9,7 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
@@ -23,7 +24,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasPacotesBoletos extends Relatorio {
 
-	private static Logger log = Logger.getLogger(RelatorioVendasPacotesBoletos.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasPacotesBoletos.class);
 
 	public static final Integer VENDIDOS = 1;
 	public static final Integer CANCELADOS = 0;

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesDetalhado.java

@@ -10,7 +10,8 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.enums.LocalEnderecoApanhe;
 import com.rjconsultores.ventaboletos.enums.SituacaoVendaPacote;
@@ -24,7 +25,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasPacotesDetalhado extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendasPacotesDetalhado.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasPacotesDetalhado.class);
 	
 	private List<RelatorioVendasPacotesDetalhadoBean> lsDadosRelatorio;
 	

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasPacotesResumido.java

@@ -9,7 +9,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -21,7 +22,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasPacotesResumido extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendasPacotesResumido.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasPacotesResumido.class);
 
 	private SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
 	

src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioVendasRequisicao.java

@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.DataSource;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
@@ -18,7 +19,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
 
 public class RelatorioVendasRequisicao extends Relatorio {
 	
-	private static Logger log = Logger.getLogger(RelatorioVendasRequisicao.class);
+	private static Logger log = LogManager.getLogger(RelatorioVendasRequisicao.class);
 
 	private List<RelatorioVendasRequisicaoBean> lsDadosRelatorio;
 	

src/java/com/rjconsultores/ventaboletos/relatorios/render/RenderRelatorioJasper.java

@@ -6,7 +6,8 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.Relatorio;
 import com.rjconsultores.ventaboletos.relatorios.utilitarios.SaidaRelatorio;
@@ -32,7 +33,7 @@ import net.sf.jasperreports.engine.util.JRProperties;
 @SuppressWarnings("deprecation")
 public class RenderRelatorioJasper {
 
-	private static Logger log = Logger.getLogger(Relatorio.class);
+	private static Logger log = LogManager.getLogger(Relatorio.class);
 
 	protected JasperPrint jasperPrint;
 

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/ArrayDataSource.java

@@ -8,7 +8,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRField;
@@ -19,7 +20,7 @@ import net.sf.jasperreports.engine.JRField;
  */
 public class ArrayDataSource implements IDataSource {
 
-	private static Logger log = Logger.getLogger(ArrayDataSource.class);
+	private static Logger log = LogManager.getLogger(ArrayDataSource.class);
 
 	protected Relatorio relatorio;
 	protected ResultSet resultSet;

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/DataSource.java

@@ -9,7 +9,8 @@ import java.sql.SQLException;
 import net.sf.jasperreports.engine.JRException;
 import net.sf.jasperreports.engine.JRField;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * @author Bruno H. G. Gouvea <bruno@rjconsultores.com.br>
@@ -17,7 +18,7 @@ import org.apache.log4j.Logger;
  */
 public class DataSource implements IDataSource {
 
-	private static Logger log = Logger.getLogger(DataSource.class);
+	private static Logger log = LogManager.getLogger(DataSource.class);
 
 	protected Relatorio relatorio;
 	protected ResultSet resultSet;

src/java/com/rjconsultores/ventaboletos/relatorios/utilitarios/Relatorio.java

@@ -5,7 +5,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.relatorios.render.RenderRelatorioJasper;
 
@@ -17,7 +18,7 @@ import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource;
  */
 public abstract class Relatorio {
 
-	private static Logger log = Logger.getLogger(Relatorio.class);
+	private static Logger log = LogManager.getLogger(Relatorio.class);
 	private static final String DEFAULT_BASE_DIR = "/com/rjconsultores/ventaboletos/relatorios";
 	private static final String FILTRO_POR_TODOS = "-1";
 	

src/java/com/rjconsultores/ventaboletos/rest/SincronizarTramos.java

@@ -8,7 +8,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.rjconsultores.ventaboletos.rest.bean.ParamsSincronizarTramo;
 import com.rjconsultores.ventaboletos.rest.service.SincronizarTramoService;
@@ -18,7 +19,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
 @Path("/sincronizarTramos")
 public class SincronizarTramos {
 	
-	private static Logger log = Logger.getLogger(SincronizarTramos.class);
+	private static Logger log = LogManager.getLogger(SincronizarTramos.class);
 	
 	@POST
 	@Consumes({ MediaType.APPLICATION_JSON })

src/java/com/rjconsultores/ventaboletos/rest/service/AlteraPricingService.java

@@ -5,7 +5,8 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.vo.pricing.Pricing;
 @Service("alteraPricingService")
 public class AlteraPricingService {
 	
-	private static Logger log = Logger.getLogger(AlteraPricingService.class);
+	private static Logger log = LogManager.getLogger(AlteraPricingService.class);
 	
 	@Autowired
 	PricingService pricingService;

src/java/com/rjconsultores/ventaboletos/rest/service/UltimaSincronizacaoService.java

@@ -1,6 +1,7 @@
 package com.rjconsultores.ventaboletos.rest.service;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,7 +18,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.spring.AppContext;
 @Service("ultimaSincronizacaoService")
 public class UltimaSincronizacaoService {
 	
-	private static Logger log = Logger.getLogger(UltimaSincronizacaoService.class);
+	private static Logger log = LogManager.getLogger(UltimaSincronizacaoService.class);
 	
 	@Autowired
 	private SincronizarService sincronizarService;

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

@@ -5,7 +5,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -55,7 +56,7 @@ public class GridCombinacionTramoRutaCoeficiente extends Grid implements RowRend
 	private ClaseServicio claseServicio;
 	private OrgaoConcedente orgaoConcedente;
 	private DataBinder dataBinder;
-	private static Logger log = Logger.getLogger(GridCombinacionTramoRutaCoeficiente.class);
+	private static Logger log = LogManager.getLogger(GridCombinacionTramoRutaCoeficiente.class);
 
 	public GridCombinacionTramoRutaCoeficiente() {
 		lsSecuenciaRutaTramoCoeficienteVO = new ArrayList<SecuenciaRutaTramoCoeficienteVO>();

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

@@ -7,7 +7,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -54,7 +55,7 @@ public class GridRutaTramo extends Grid implements RowRenderer, RendererCtrl {
 	private ClaseServicio claseServicio;
 	private DataBinder dataBinder;
 	private boolean mostraPopupGrid;
-	private static Logger log = Logger.getLogger(GridRutaTramo.class);
+	private static Logger log = LogManager.getLogger(GridRutaTramo.class);
 	private boolean isPrimeiraVia;
 
 	public GridRutaTramo() {

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

@@ -5,7 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.BooleanUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.util.resource.Labels;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -60,7 +61,7 @@ public class GridRutaTramoCoeficiente extends Grid implements RowRenderer, Rende
 	private ClaseServicio claseServicio;
 	private OrgaoConcedente orgaoConcedente;
 	private DataBinder dataBinder;
-	private static Logger log = Logger.getLogger(GridRutaTramoCoeficiente.class);
+	private static Logger log = LogManager.getLogger(GridRutaTramoCoeficiente.class);
 
 	public GridRutaTramoCoeficiente() {
 		lsSecuenciaRutaTramoCoeficienteVO = new ArrayList<SecuenciaRutaTramoCoeficienteVO>();

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

@@ -11,7 +11,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 public class BusquedaBpeExportacaoController extends MyGenericForwardComposer {
 	private static final long serialVersionUID = 1L;
 
-	private static Logger log = Logger.getLogger(BusquedaBpeExportacaoController.class);
+	private static Logger log = LogManager.getLogger(BusquedaBpeExportacaoController.class);
 
 	@Autowired
 	private BpeService bpeService;

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

@@ -7,7 +7,8 @@ import java.util.Map;
 
 import javax.sql.DataSource;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderEstadoUf;
 public class BusquedaBpeRdiController extends MyGenericForwardComposer {
 	private static final long serialVersionUID = 1L;
 
-	private static Logger log = Logger.getLogger(BusquedaBpeRdiController.class);
+	private static Logger log = LogManager.getLogger(BusquedaBpeRdiController.class);
 
 	@Autowired
 	private DataSource dataSourceRead;

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

@@ -13,7 +13,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -71,7 +72,7 @@ public class BusquedaConfTotemController extends MyGenericForwardComposer {
 	private Checkbox chktListarPassageiroUltimaPoltrona;
 	private Checkbox chkPermitirVendaRapida;
 	private Checkbox chkIndImprime2Via;
-	private static Logger log = Logger.getLogger(BusquedaConfTotemController.class);
+	private static Logger log = LogManager.getLogger(BusquedaConfTotemController.class);
 	private MyListbox empresaList;
 	private MyListbox bandeirasList;
 	@Autowired

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

@@ -30,7 +30,7 @@ public class BusquedaHotelController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
 	
-	private static final Logger log = LoggerFactory.getLogger(BusquedaHotelController.class);
+	private static Logger log = LoggerFactory.getLogger(BusquedaHotelController.class);
 
 	@Autowired
     private transient PagedListWrapper<Hotel> plwHotel;

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

@@ -30,7 +30,7 @@ public class BusquedaPacoteConvenioController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
 	
-	private static final Logger log = LoggerFactory.getLogger(BusquedaPacoteConvenioController.class);
+	private static Logger log = LoggerFactory.getLogger(BusquedaPacoteConvenioController.class);
 
 	@Autowired
     private transient PagedListWrapper<PacoteConvenio> plwPacoteConvenio;

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

@@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -40,7 +41,7 @@ public class EditarArticuloController extends MyGenericForwardComposer {
 	private MyListbox articuloList;
 	private Button btnApagar;
 	private MyTextbox txtNome;
-	private static Logger log = Logger.getLogger(EditarArticuloController.class);
+	private static Logger log = LogManager.getLogger(EditarArticuloController.class);
 
 	public Articulo getArticulo() {
 		return articulo;

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

@@ -15,7 +15,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
 import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -48,8 +49,7 @@ public class EditarAsociacionClaseServicioMarcaController extends MyGenericForwa
     private Combobox cmbMarca;
     private Combobox cmbClaseServicio;
     private Button btnApagar;
-    private static Logger log =
+    private static final Logger log = LogManager.getLogger(EditarAsociacionClaseServicioMarcaController.class);
-            Logger.getLogger(EditarAsociacionClaseServicioMarcaController.class);
 
     public List<ClaseServicio> getLsClaseServicios() {
         return lsClaseServicios;

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

@@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -38,7 +39,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 public class EditarAutorizacaoUsoSerieEmbarcadaController extends MyGenericForwardComposer {
 	private static final long serialVersionUID = 3681643325026575959L;
 
-	private static Logger log = Logger.getLogger(EditarAutorizacaoUsoSerieEmbarcadaController.class);
+	private static Logger log = LogManager.getLogger(EditarAutorizacaoUsoSerieEmbarcadaController.class);
 	
 	@Autowired
 	private EstadoService estadoService;

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

@@ -8,7 +8,8 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -51,7 +52,7 @@ public class EditarCategoriaController extends MyGenericForwardComposer {
     private MyListbox categoriaList;
     private Button btnApagar;
     private Button btnSalvar;
-    private static Logger log = Logger.getLogger(EditarCategoriaController.class);
+    private static Logger log = LogManager.getLogger(EditarCategoriaController.class);
     private MyTextbox txtNome;
     private MyTextbox txtCvecategoria;
     private MyTextbox txtDescImpresionGratuidade;

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

@@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -47,7 +48,7 @@ public class EditarCiudadController extends MyGenericForwardComposer {
 	private List<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;

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

@@ -9,7 +9,8 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -43,7 +44,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal;
 public class EditarClaseServicioController extends MyGenericForwardComposer {
 	private static final long serialVersionUID = 578894379723590151L;
 
-    private static Logger log = Logger.getLogger(EditarClaseServicioController.class);
+    private static Logger log = LogManager.getLogger(EditarClaseServicioController.class);
 	
 	@Autowired
     private ClaseServicioService claseServicioService;

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

@@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -47,7 +48,7 @@ public class EditarColoniaController extends MyGenericForwardComposer {
     private ColoniaService coloniaService;
     private Colonia colonia;
     private MyListbox coloniaList;
-    private static Logger log = Logger.getLogger(EditarColoniaController.class);
+    private static Logger log = LogManager.getLogger(EditarColoniaController.class);
     private MyTextbox txtNome;
     private Button btnApagar;
     private MyComboboxCiudad cmbCiudad;

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

@@ -10,7 +10,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -50,7 +51,7 @@ public class EditarConfTotemController extends MyGenericForwardComposer {
 	private Combobox cmbSistema;
 	private List<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 {

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

@@ -9,7 +9,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -44,7 +45,7 @@ public class EditarConfTotemVentaRapidaController extends MyGenericForwardCompos
 	 */
 	private static final long serialVersionUID = 1L;
 	@Autowired
-	private static Logger log = Logger.getLogger(EditarConfTotemVentaRapidaController.class);
+	private static Logger log = LogManager.getLogger(EditarConfTotemVentaRapidaController.class);
 	private MyComboboxParada cmbParadaOrigem;
 	private MyListbox localidadesDestinoList;
 	@Autowired

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

@@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -24,7 +25,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 public class EditarContaBancariaEmpresaController extends MyGenericForwardComposer {
 	
 	private static final long serialVersionUID = 1L;
-	private static Logger log = Logger.getLogger(EditarContaBancariaEmpresaController.class);
+	private static Logger log = LogManager.getLogger(EditarContaBancariaEmpresaController.class);
 	
 	@Autowired
 	private InstiFinanceiraService instFinanceiraService;

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

@@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -30,7 +31,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextboxSimple;
 public class EditarContaMDController extends MyGenericForwardComposer {
 	private static final long serialVersionUID = 1L;
 
-	private static Logger log = Logger.getLogger(EditarContaMDController.class);
+	private static Logger log = LogManager.getLogger(EditarContaMDController.class);
 
 	@Autowired
 	private ContaMDService contaMDService;

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

@@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
 import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import java.util.Calendar;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -42,7 +43,7 @@ public class EditarCuponConvenioController extends MyGenericForwardComposer {
     private Intbox folioInicio;
     private Intbox folioFin;
     private List<TipoConvenio> tipoConvenioList;
-    private static Logger log = Logger.getLogger(EditarCuponConvenioController.class);
+    private static Logger log = LogManager.getLogger(EditarCuponConvenioController.class);
 
     public Combobox getCmbTipoConvenio() {
         return cmbTipoConvenio;

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

@@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -31,7 +32,7 @@ public class EditarCursoController  extends MyGenericForwardComposer {
 	private CursoService CursoService;
 	private Curso curso;
 	private MyListbox cursoList;
-	private static Logger log = Logger.getLogger(EditarCursoController.class);
+	private static Logger log = LogManager.getLogger(EditarCursoController.class);
 	private MyTextbox txtNome;
 	private Button btnApagar;
 

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

@@ -8,7 +8,8 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -51,7 +52,7 @@ public class EditarCustomController extends MyGenericForwardComposer {
 	private List<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 {

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

@@ -8,7 +8,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -52,7 +53,7 @@ public class EditarCustomUploadArquivoController extends MyGenericForwardCompose
 	private Checkbox chkSubstituirExistente;
 	private Label lbNomeArquivo;
 
-	private static Logger log = Logger.getLogger(EditarCustomUploadArquivoController.class);
+	private static Logger log = LogManager.getLogger(EditarCustomUploadArquivoController.class);
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {

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

@@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -56,7 +57,7 @@ public class EditarDetDiagramaAutobusController extends MyGenericForwardComposer
 	private Comboitem cbiWest;
 	private Comboitem cbiEast;
 	private Comboitem cbiSouth;
-	private static Logger log = Logger.getLogger(EditarDetDiagramaAutobusController.class);
+	private static Logger log = LogManager.getLogger(EditarDetDiagramaAutobusController.class);
 	public final static String ASIENTO = "ASIENTO";
 	private String itemCombo = ASIENTO;
 	private String itemOrientacion = DetDiagramaAutobus.ORIENTACION_W;

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

@@ -9,7 +9,8 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -85,7 +86,7 @@ public class EditarDispositivoVendaEmbarcadaController extends MyGenericForwardC
 	private String motivoManutencao;
 	private String motivoBaixado;
 	private boolean isNovoDispositivo;
-	private static Logger log = Logger.getLogger(EditarDispositivoVendaEmbarcadaController.class);
+	private static Logger log = LogManager.getLogger(EditarDispositivoVendaEmbarcadaController.class);
 
 	@Override
 	public void doAfterCompose(Component comp) throws Exception {

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

@@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -31,7 +32,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
 @Scope("prototype")
 public class EditarEmpleadoController extends MyGenericForwardComposer {
 
-	private static Logger log = Logger.getLogger(EditarEmpleadoController.class);
+	private static Logger log = LogManager.getLogger(EditarEmpleadoController.class);
 	
 	
 	private MyTextbox txtCveEmpleado;

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

@@ -35,7 +35,8 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.brazilutils.br.cpfcnpj.Cnpj;
 import org.brazilutils.br.cpfcnpj.Cpf;
 import org.brazilutils.validation.ValidationException;
@@ -146,7 +147,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.security.SecurityEmpresaToke
 public class EditarEmpresaController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
-	private static Logger log = Logger.getLogger(EditarEmpresaController.class);
+	private static Logger log = LogManager.getLogger(EditarEmpresaController.class);
 	@Autowired
 	private EmpresaService empresaService;
 	@Autowired

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaImpostoController.java

@@ -8,7 +8,8 @@ import java.math.BigDecimal;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -45,7 +46,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderAliquotaEstadoD
 public class EditarEmpresaImpostoController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
-	private static Logger log = Logger.getLogger(EditarEmpresaImpostoController.class);
+	private static Logger log = LogManager.getLogger(EditarEmpresaImpostoController.class);
 
 
 	private EmpresaImposto empresaImposto;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEmpresaInscricaoEstadualController.java

@@ -5,7 +5,8 @@ import java.util.List;
 
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -47,7 +48,7 @@ public class EditarEmpresaInscricaoEstadualController extends MyGenericForwardCo
 
 	private static final long serialVersionUID = 1L;
 	@SuppressWarnings("unused")
-	private static Logger log = Logger.getLogger(EditarEmpresaInscricaoEstadualController.class);
+	private static Logger log = LogManager.getLogger(EditarEmpresaInscricaoEstadualController.class);
 
 	@Autowired
 	private EmpresaService empresaService;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEscolaController.java

@@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -34,7 +35,7 @@ public class EditarEscolaController extends MyGenericForwardComposer {
 	private EscolaService EscolaService;
 	private Escola escola;
 	private MyListbox escolaList;
-	private static Logger log = Logger.getLogger(EditarEscolaController.class);
+	private static Logger log = LogManager.getLogger(EditarEscolaController.class);
 	private MyTextbox txtNome;
 	private MyComboboxCiudad cmbCiudad;
 	private Button btnApagar;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarEstadoController.java

@@ -8,7 +8,8 @@ import java.util.Calendar;
 import java.util.List;
 
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -52,7 +53,7 @@ public class EditarEstadoController extends MyGenericForwardComposer {
 	private Estado estado;
 	private List<Pais> lsPais;
 	private MyListbox estadoList;
-	private static Logger log = Logger.getLogger(EditarEstadoController.class);
+	private static Logger log = LogManager.getLogger(EditarEstadoController.class);
 	private MyTextbox txtNome;
 	private MyTextbox txtUf;
 	private Combobox cmbPais;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarFormaPagoController.java

@@ -8,7 +8,8 @@ import java.util.Calendar;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -65,7 +66,7 @@ public class EditarFormaPagoController extends MyGenericForwardComposer {
 	private Radio rd4;
 	private Radio radioImp;
 	private Radio radioPor;
-	private static Logger log = Logger.getLogger(EditarFormaPagoController.class);
+	private static Logger log = LogManager.getLogger(EditarFormaPagoController.class);
 	private Row rowEquivalencia;
 	private Row rowRestricaoFormaPago;
 	private Row rowTransferenciaReativacao;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoCategoriaController.java

@@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -30,7 +31,7 @@ public class EditarGrupoCategoriaController extends MyGenericForwardComposer {
 
 	private GrupoCategoria grupoCategoria;
 	private MyListbox grupoCategoriaList;
-	private static Logger log = Logger.getLogger(EditarGrupoCategoriaController.class);
+	private static Logger log = LogManager.getLogger(EditarGrupoCategoriaController.class);
 	private MyTextbox txtDesc;
 	private BusquedaGrupoCategoriaController busquedaGrupoCategoriaController;
 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarGrupoRutaController.java

@@ -12,7 +12,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
 import java.util.Calendar;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -36,7 +37,7 @@ public class EditarGrupoRutaController extends MyGenericForwardComposer {
 	private MyListbox grupoRutaList;
 	private MyTextbox txtNome;
 	private Button btnApagar;
-	private static Logger log = Logger.getLogger(EditarGrupoRutaController.class);
+	private static Logger log = LogManager.getLogger(EditarGrupoRutaController.class);
 
 	public GrupoRuta getGrupoRuta() {
 		return grupoRuta;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarHotelController.java

@@ -2,7 +2,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 
 import java.util.Calendar;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -25,7 +26,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
 @Scope("prototype")
 public class EditarHotelController extends MyGenericForwardComposer {
 
-	private static Logger log = Logger.getLogger(EditarHotelController.class);
+	private static Logger log = LogManager.getLogger(EditarHotelController.class);
 	
 	private static final long serialVersionUID = 1L;
 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarImagemController.java

@@ -15,7 +15,8 @@ import javax.servlet.ServletContext;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -59,7 +60,7 @@ public class EditarImagemController extends MyGenericForwardComposer {
 	private Image img;
 	private MyTextbox txtNome;
 	private Button btnApagar;
-	private static Logger log = Logger.getLogger(EditarImagemController.class);
+	private static Logger log = LogManager.getLogger(EditarImagemController.class);
 	private Combobox cmbEmpresa;
 
 	@Override

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMarcaController.java

@@ -17,7 +17,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -53,7 +54,7 @@ public class EditarMarcaController extends MyGenericForwardComposer {
 	private Image img;
 	private MyTextbox txtNome;
 	private Button btnApagar;
-	private static Logger log = Logger.getLogger(EditarMarcaController.class);
+	private static Logger log = LogManager.getLogger(EditarMarcaController.class);
 	private Row rowEquivalencia;
 	private Combobox cmbEmpresa;
 

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMensagemRecusaController.java

@@ -3,7 +3,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.zkoss.zul.Textbox;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
@@ -29,7 +30,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
 public class EditarMensagemRecusaController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
-	private static Logger log = Logger.getLogger(EditarMensagemRecusaController.class);
+	private static Logger log = LogManager.getLogger(EditarMensagemRecusaController.class);
 
 	private MensagemRecusa mensagemRecusa;
 	private BusquedaMensagemRecusaController busquedaMensagemRecusaController;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarMonedaController.java

@@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -45,7 +46,7 @@ public class EditarMonedaController extends MyGenericForwardComposer {
 	private Button btnApagar;
 	private Button btnSalvar;
 	private BusquedaMonedaController busquedaMonedaController;
-	private static Logger log = Logger.getLogger(EditarMonedaController.class);
+	private static Logger log = LogManager.getLogger(EditarMonedaController.class);
 	private MyTextbox txtNome;
 	private MyTextbox txtSimbolo;
 	private Row rowEquivalencia;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOCDParamController.java

@@ -4,7 +4,8 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -85,7 +86,7 @@ public class EditarOCDParamController extends MyGenericForwardComposer {
 	private Radio rdSomenteCartao;
 	private Radio rdTodasFormasPagamento;
 
-	private static Logger log = Logger.getLogger(EditarOCDParamController.class);
+	private static Logger log = LogManager.getLogger(EditarOCDParamController.class);
 	
 	public Button getBtnApagar() {
 		return btnApagar;

src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarOperadoresDispositivoController.java

@@ -7,7 +7,8 @@ package com.rjconsultores.ventaboletos.web.gui.controladores.catalogos;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Controller;
@@ -41,7 +42,7 @@ import com.rjconsultores.ventaboletos.web.utilerias.render.RenderUsuarioDisposit
 public class EditarOperadoresDispositivoController extends MyGenericForwardComposer {
 
 	private static final long serialVersionUID = 1L;
-	private static Logger log = Logger.getLogger(EditarOperadoresDispositivoController.class);
+	private static Logger log = LogManager.getLogger(EditarOperadoresDispositivoController.class);
 
 	/**
 	 * ListBox dos usuários que estáo atrelados ao dispositivo