prodigasistemas · JulianCambraia · Jul 11, 2014 · Jul 11, 2014 · Jul 11, 2014 · Jul 11, 2014
diff --git a/.gitignore b/.gitignore
@@ -16,6 +16,9 @@ scripts/build/build_gcom_desenv.sh
 scripts/build/build_gcom_homolog.sh
 scripts/build/build_gcom_prod_online.sh
 scripts/build/build_gcom_prod_batch.sh
+migrations/gsandbs.rar
+migrations/jboss-4.0.1sp1.rar
+migrations/mybatis-migrations-3.2.0.zip
 migrations/gerencial/environments/local.properties
 migrations/gerencial/environments/development.properties
 migrations/gerencial/environments/stage.properties

diff --git a/build.xml b/build.xml
@@ -7,7 +7,7 @@
 	</tstamp>
 
 	<property file="build.properties" />
-
+	
 	<property name="servidor.tipo" value="${gsan.tipo}" />
 	<property name="servidor.versao" value="5.1.1.57" />
 
@@ -20,11 +20,14 @@
 	<property name="Struts.home" value="lib/Struts1.1" />
 	<property name="deploy.lib.dir" value="lib/deploy" />
 	<property name="Servlet.home" value="lib/Servlet" />
+	<property name="Hibernate3.home" value="lib/hibernate-3.1" />
 	<property name="MenuTagLib.home" value="lib/MenuTagLib" />
+	<property name="Axis2.home" value="lib/Axis2" />
+	<property name="Apache-Ant-1.6.2.home" value="lib/apache-ant-1.6.2" />
 	<property name="JasperReports.home" value="lib/JasperReports 1.2.2" />
 	<property name="JAF.home" value="lib/JAF" />
 	<property name="JavaMail.home" value="lib/Javamail" />
-	<property name="PostGreSQL7.4.home" value="lib/DriverPostGres/7.4" />
+	<property name="PostGreSQL9.3.home" value="lib/DriverPostGres/9.3" />
 	<property name="Properties.home" value="src/gcom" />
 	<property name="PagerTagLib.home" value="lib/PagerTagLib" />
 	<property name="JSTL.home" value="lib/JSTL 1.1" />
@@ -86,9 +89,9 @@
 		<pathelement location="${PagerTagLib.home}/pager-taglib.jar" />
 		<pathelement location="${JAF.home}/activation.jar" />
 		<pathelement location="${JavaMail.home}/mail.jar" />
-		<pathelement location="${Axis.home}/commons-httpclient-3.1.jar" />
+		<pathelement location="${Axis2.home}/commons-httpclient-3.1.jar" />
+		<pathelement location="${Apache-Ant-1.6.2.home}/bcel-5.1.jar" />
 		<pathelement location="/reports" />
-
 	</path>
 
 	<target name="alterarDataVersao" depends="init">
@@ -173,6 +176,9 @@
 			<fileset dir="${JSTL.home}">
 				<include name="*.jar" />
 			</fileset>
+			<fileset dir="${Quartz.home}">
+				<include name="*.jar" />
+			</fileset>
 			<fileset dir="${JavaHelp.home}">
 				<include name="*.jar" />
 			</fileset>
@@ -195,7 +201,7 @@
 			</classpath>
 		</taskdef>
 
-		<jrc srcdir="${CaminhoReports}" destdir="${CaminhoReports}" tempdir="${CaminhoReports}" keepjava="false" xmlvalidation="false">
+		<jrc srcdir="${CaminhoReports}" destdir="${CaminhoReports}" tempdir="${CaminhoReports}" keepjava="false" xmlvalidation="true">
 			<classpath>
 				<fileset dir="${JasperReports.home}">
 					<include name="*.jar" />

diff --git a/descriptors/batchAtualizarCodigoDebitoAutomatico/META-INF/jboss.xml b/descriptors/batchAtualizarCodigoDebitoAutomatico/META-INF/jboss.xml
@@ -9,13 +9,15 @@
 			<destination-jndi-name>
 				BatchAtualizarCodigoDebitoAutomaticoMDB
 			</destination-jndi-name>
+
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-						message-driven-bean-limite10
+						message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>
+
 		</message-driven>
 	</enterprise-beans>
 </jboss>
diff --git a/descriptors/batchEmitirOrdemDeFiscalizacao/META-INF/jboss.xml b/descriptors/batchEmitirOrdemDeFiscalizacao/META-INF/jboss.xml
@@ -12,7 +12,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-					message-driven-bean-limite10
+					message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchEncerrarComandoOSSeletivaInspecaoAnormalidade/META_INF/jboss.xml b/descriptors/batchEncerrarComandoOSSeletivaInspecaoAnormalidade/META_INF/jboss.xml
@@ -12,7 +12,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-					message-driven-bean-limite10
+					message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchGerarDadosArquivoAcompanhamentoServico/META_INF/jboss.xml b/descriptors/batchGerarDadosArquivoAcompanhamentoServico/META_INF/jboss.xml
@@ -12,7 +12,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-					message-driven-bean-limite10
+					message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchGerarResumoAcoesCobrancaCronograma/META-INF/jboss.xml b/descriptors/batchGerarResumoAcoesCobrancaCronograma/META-INF/jboss.xml
@@ -10,7 +10,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-						message-driven-bean-limite10
+						message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchGerarResumoAcoesCobrancaCronogramaEncerrarOS/META-INF/jboss.xml b/descriptors/batchGerarResumoAcoesCobrancaCronogramaEncerrarOS/META-INF/jboss.xml
@@ -7,13 +7,15 @@
 			<destination-jndi-name>
 				BatchGerarResumoAcoesCobrancaCronogramaEncerrarOSMDB
 			</destination-jndi-name>
+			<!-- 
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
 						message-driven-bean-limite10
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>
+			-->
 		</message-driven>
 	</enterprise-beans>
 </jboss>
diff --git a/descriptors/batchGerarResumoDiarioNegativacao/META-INF/jboss.xml b/descriptors/batchGerarResumoDiarioNegativacao/META-INF/jboss.xml
@@ -11,11 +11,10 @@
 				BatchGerarResumoDiarioNegativacaoMDB
 
 			</destination-jndi-name>
-
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-					message-driven-bean-limite10
+					message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchGerarResumoLigacoesEconomiasPorAno/META-INF/jboss.xml b/descriptors/batchGerarResumoLigacoesEconomiasPorAno/META-INF/jboss.xml
@@ -9,11 +9,10 @@
 			<destination-jndi-name>
 				BatchGerarResumoLigacoesEconomiasPorAnoMDB
 			</destination-jndi-name>
-
 			 <invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-						message-driven-bean-limite10
+						message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchGerarResumoPendenciaPorAno/META-INF/jboss.xml b/descriptors/batchGerarResumoPendenciaPorAno/META-INF/jboss.xml
@@ -11,15 +11,13 @@
 					BatchGerarResumoPendenciaPorAnoMDB
 
 				</destination-jndi-name>
-
 			 	<invoker-bindings>
 					<invoker>
 						<invoker-proxy-binding-name>
-							message-driven-bean-limite15
+							message-driven-bean
 						</invoker-proxy-binding-name>
 					</invoker>
 				</invoker-bindings>
-
 		</message-driven>
 	</enterprise-beans>
 </jboss>	
diff --git a/descriptors/batchGerarTxtOsInspecaoAnormalidade/META-INF/jboss.xml b/descriptors/batchGerarTxtOsInspecaoAnormalidade/META-INF/jboss.xml
@@ -12,7 +12,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-					message-driven-bean-limite10
+						message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchInserirResumoAcoesCobrancaCronograma/META-INF/jboss.xml b/descriptors/batchInserirResumoAcoesCobrancaCronograma/META-INF/jboss.xml
@@ -10,7 +10,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-						message-driven-bean-limite10
+						message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchProgramacaoAutoRoteiroAcompServico/META_INF/jboss.xml b/descriptors/batchProgramacaoAutoRoteiroAcompServico/META_INF/jboss.xml
@@ -12,7 +12,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-					message-driven-bean-limite10
+						message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/descriptors/batchRelatorioContasBaixadasContabilmente/META-INF/jboss.xml b/descriptors/batchRelatorioContasBaixadasContabilmente/META-INF/jboss.xml
@@ -10,7 +10,7 @@
 			<invoker-bindings>
 				<invoker>
 					<invoker-proxy-binding-name>
-						message-driven-bean-limite10
+						message-driven-bean
 					</invoker-proxy-binding-name>
 				</invoker>
 			</invoker-bindings>

diff --git a/documents/documents.rar b/documents/documents.rar
diff --git a/gcom/WEB-INF/struts-config.xml b/gcom/WEB-INF/struts-config.xml
@@ -3571,6 +3571,16 @@
 
 
 		<!-- INICIO FILTRAR IMOVEL OUTROS CRITERIOS -->
+		<!-- Julian Fernando -->
+		<action name="ImovelOutrosCriteriosActionForm"
+			type="gcom.gui.cadastro.imovel.ExibirFiltrarImovelOutrosCriterios"
+			validate="false" parameter="action" scope="session"
+			path="/exibirFiltrarImovelOutrosCriterios">
+
+			<forward name="exibirFiltrarImovelOutrosCriterios"
+				path="/filtrarImovelOutrosCriteriosWizardAction.do?action=exibirFiltrarImovelOutrosCriteriosLocalizarImoveis" />
+		</action>
+
 		<action name="ImovelOutrosCriteriosActionForm"
 			type="gcom.gui.cadastro.imovel.ExibirFiltrarImovelOutrosCriterios"
 			validate="false" parameter="action" scope="session"

diff --git a/gcom/WEB-INF/web.xml b/gcom/WEB-INF/web.xml
@@ -5,7 +5,6 @@
 	version="2.4">
 
 
-
 	<filter>
 		<filter-name>filtroSessaoExpirada</filter-name>
 		<filter-class>gcom.gui.util.FiltroSessaoExpirada</filter-class>
@@ -25,7 +24,7 @@
 		<filter-name>filtroSessaoExpirada</filter-name>
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
-	
+
 	<filter>
 		<filter-name>filtroAtualizarQuadroAvisos</filter-name>
 		<filter-class>gcom.gui.util.FiltroAtualizarQuadroAvisos</filter-class>
@@ -50,7 +49,7 @@
 		<filter-name>filtroSessao</filter-name>
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
-
+	
 	<filter>
 		<filter-name>filtroSegurancaAcesso</filter-name>
 		<filter-class>gcom.gui.util.FiltroSegurancaAcesso</filter-class>
@@ -60,15 +59,12 @@
 		<filter-name>filtroSegurancaAcesso</filter-name>
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
-
-
-
+
 	<filter-mapping>
 		<filter-name>requestControlFilter</filter-name>
 		<url-pattern>*.do</url-pattern>
 	</filter-mapping>
 
-
 	<servlet>
 		<servlet-name>InicializadorSistema</servlet-name>
 		<servlet-class>gcom.gui.InicializadorSistema</servlet-class>
@@ -98,7 +94,6 @@
 	  <url-pattern>*.css</url-pattern>
 	</filter-mapping>
 
-
     <filter-mapping>
 	  <filter-name>ResponseHeaderFilter</filter-name>
 	  <url-pattern>*.js</url-pattern>

diff --git a/gcom/imagens/jqgrid/Thumbs.db b/gcom/imagens/jqgrid/Thumbs.db
diff --git a/gcom/imagens/lightbox/Thumbs.db b/gcom/imagens/lightbox/Thumbs.db
diff --git a/gcom/imagens/logogsan.png b/gcom/imagens/logogsan.png
diff --git a/gcom/imagens/portal/Thumbs.db b/gcom/imagens/portal/Thumbs.db
diff --git a/gcom/imagens/titulo.gif b/gcom/imagens/titulo.gif
diff --git a/gcom/jsp/acesso/principal.jsp b/gcom/jsp/acesso/principal.jsp
@@ -20,7 +20,6 @@
           var empresa;
           interval *= 1000;
 
-
           var image_index = 0;
 
           image_list = new Array();
@@ -162,9 +161,6 @@
                     </tr>
                   </table>
 
-
-
-
                  <logic:equal name="RAUrgencia" value="true" scope="session">
 
 	                 <logic:present name="msgUrgencia1" scope="session">

diff --git a/gcom/jsp/cadastro/funcionario_cargo_atualizar.jsp b/gcom/jsp/cadastro/funcionario_cargo_atualizar.jsp
@@ -122,7 +122,7 @@ function limparForm() {
 				<tr>
 					<td><strong>C�digo: </strong></td>
 					<td colspan="2"><span class="style2"> <html:text
-						property="codigo" size="5" maxlength="5" /> </span></td>
+						property="codigo" size="5" maxlength="5" readonly="true" /> </span></td>
 				</tr>
 
 

diff --git a/gcom/jsp/micromedicao/leitura/leitura_fiscalizacao_filtrar_informar.jsp b/gcom/jsp/micromedicao/leitura/leitura_fiscalizacao_filtrar_informar.jsp
@@ -170,7 +170,7 @@
 						scope="request">
 						<html:text property="inscricaoImovel" size="20" readonly="true"
 							style="background-color:#EFEFEF; border:0; color: #000000" />
-					</logic:notPresent> <a href="javascript:limparForm();"> <img
+					</logic:notPresent> <a href="javascript:limparIncricaoImovel();"> <img
 						src="<bean:message key="caminho.imagens"/>limparcampo.gif"
 						border="0" title="Apagar" /></a></td>
 				</tr>

diff --git a/gcom/jsp/micromedicao/leitura/leitura_fiscalizacao_informar.jsp b/gcom/jsp/micromedicao/leitura/leitura_fiscalizacao_informar.jsp
@@ -69,7 +69,13 @@
 	    }
   	}
 
-
+	function limparForm() {
+
+		var form = document.InformarLeituraFiscalizacaoActionForm;
+
+		form.matricula.value = "";
+		form.inscricaoImovel.value = "";
+	}
 
 </script>
 

diff --git a/gcom/jsp/operacional/distrito_operacional_inserir.jsp b/gcom/jsp/operacional/distrito_operacional_inserir.jsp
@@ -29,19 +29,19 @@
 <script language="JavaScript">
 
     function validarForm() {
-    var form = document.forms[0];
-	  if(validateInserirDistritoOperacionalActionForm(form)){	     
-		  submeterFormPadrao(form); 
-		  }
-   	  }
-       
+    	var form = document.forms[0];
+	  	if	(validateInserirDistritoOperacionalActionForm(form)) {	     
+		  	submeterFormPadrao(form); 
+		}
+   	}
+
   	function limparForm() {
 		var form = document.forms[0];
 		form.descricao.value = "";
 	    form.descricaoAbreviada.value = "";
+	    form.sistemaAbastecimento.value = "-1";  	
         form.setorAbastecimento.value = "-1";
-	    form.zonaAbastecimento.value = "-1";  	
-	 }
+	}
 
 </script>
 

diff --git a/gcom/jsp/util/cabecalho.jsp b/gcom/jsp/util/cabecalho.jsp
@@ -42,7 +42,7 @@
 						</td>
 
 						<td align="right" valign="bottom">
-							<img src="<bean:message key="caminho.imagens"/>logo_menu_superior.gif" border="0">
+							<img src="<bean:message key="caminho.imagens"/>back-sgqa.gif" border="0">
 						</td>
 
 					</tr>

diff --git a/gcom/jsp/util/rodape.jsp b/gcom/jsp/util/rodape.jsp
@@ -22,4 +22,4 @@
 		</td>
   	</tr>
 </table>
-</logic:notPresent>
+</logic:notPresent>
diff --git a/gsanHelpOnline/index.php b/gsanHelpOnline/index.php
@@ -0,0 +1,6 @@
+<?php
+    header("Status: 301 Moved Permanently");
+    header("Location:"
+		. "xwiki.ipad.com.br_8027/xwiki/bin/view/AjudaGSAN/"
+		. $_SERVER['QUERY_STRING']);
+    exit;
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,7 @@ @@
     						</td>
     						<td align="right" valign="bottom">
-    							<img src="<bean:message key="caminho.imagens"/>logo_menu_superior.gif" border="0">
+    							<img src="<bean:message key="caminho.imagens"/>back-sgqa.gif" border="0">
     						</td>
     					</tr>
@@ Expand Down @@