From 0a8d6b16682dbb7c85d20e266c34c408ab2eeaed Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 31 Oct 2012 21:18:52 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@22338
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 src/java/spring-config.xml                    | 45 +++++++------------
 web/WEB-INF/i3-label_pt_BR.label              |  2 +-
 .../configLayoutImpressaoBoleto.zul           |  6 +++
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml
index 20a4bfa0a..e5ee8328d 100644
--- a/src/java/spring-config.xml
+++ b/src/java/spring-config.xml
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:aop="http://www.springframework.org/schema/aop"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p" xmlns:aop="http://www.springframework.org/schema/aop"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
        http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
 
 	<!-- Hibernate config -->
-	<context:property-placeholder
-		location="classpath:/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties" />
+	<context:property-placeholder location="classpath:/com/rjconsultores/ventaboletos/web/cliente/conf/database.properties" />
 	<context:component-scan base-package="com.rjconsultores.ventaboletos" />
 	<tx:annotation-driven transaction-manager="transactionManager" />
 
-	<bean id="sessionFactory"
-		class="com.rjconsultores.ventaboletos.utilerias.spring.MyAnnotationSessionFactoryBean">
+	<bean id="sessionFactory" class="com.rjconsultores.ventaboletos.utilerias.spring.MyAnnotationSessionFactoryBean">
 		<property name="dataSource">
 			<ref local="dataSource" />
 		</property>
@@ -298,44 +294,37 @@
 		</property>
 	</bean>
 
-	<bean id="transactionManager"
-		class="org.springframework.orm.hibernate3.HibernateTransactionManager">
+	<bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
 		<property name="sessionFactory" ref="sessionFactory" />
 	</bean>
 
-	<bean id="contextApplicationContextProvider"
-		class="com.rjconsultores.ventaboletos.web.utilerias.spring.ApplicationContextProvider">
+	<bean id="contextApplicationContextProvider" class="com.rjconsultores.ventaboletos.web.utilerias.spring.ApplicationContextProvider">
 	</bean>
 
 <!-- 	<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean"> -->
-<!-- 		<property name="resourceRef" value="true" /> -->
-<!-- 		<property name="jndiName" value="${database.jndi.name}" /> -->
+<!-- 	<property name="resourceRef" value="true" /> -->
+<!-- 	<property name="jndiName" value="${database.jndi.name}" /> -->
 <!-- 	</bean> -->
 
 	<bean id="dataSource"
-	class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-	<property name="driverClassName" value="${database.driver}" />
-	<property name="url" value="${database.url}" />
-	<property name="username" value="${database.username}" />
-	<property name="password" value="${database.password}" />
+		class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+		<property name="driverClassName" value="${database.driver}" />
+		<property name="url" value="${database.url}" />
+		<property name="username" value="${database.username}" />
+		<property name="password" value="${database.password}" />
 	</bean>
 
 	<!-- ====================================================== -->
 	<!-- Search class from Hibernate-Generic-DAO framework -->
 	<!-- ====================================================== -->
-	<bean id="hibernateSearchSupport" scope="prototype"
-		class="com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchSupportImpl">
+	<bean id="hibernateSearchSupport" scope="prototype" class="com.rjconsultores.ventaboletos.web.utilerias.paginacion.HibernateSearchSupportImpl">
 		<property name="sessionFactory" ref="sessionFactory" />
 		<property name="hibernateSearchProcessor">
-			<bean class="com.trg.search.hibernate.HibernateSearchProcessor"
-				factory-method="getInstanceForSessionFactory">
+			<bean class="com.trg.search.hibernate.HibernateSearchProcessor" factory-method="getInstanceForSessionFactory">
 				<constructor-arg ref="sessionFactory" />
 			</bean>
 		</property>
 	</bean>
-	<bean id="sqlFactory"
-		class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLFactory" />
-	<bean id="sqlBuilder"
-		class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder"
-		factory-bean="sqlFactory" factory-method="getBuilder" />
+	<bean id="sqlFactory" class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLFactory" />
+	<bean id="sqlBuilder" class="com.rjconsultores.ventaboletos.dao.sqlbuilder.SQLBuilder" factory-bean="sqlFactory" factory-method="getBuilder" />
 </beans>
\ No newline at end of file
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index 443f2d4c1..a67a38a7a 100644
--- a/web/WEB-INF/i3-label_pt_BR.label
+++ b/web/WEB-INF/i3-label_pt_BR.label
@@ -7,7 +7,7 @@
 # <controler>. <id>. <propiedade> = XXX
 
 #Versao do VentaBoleto:
-versao = ADM_20121029_1RC77
+versao = ADM_20121031_1RC78
 
 # MSG Defaut:
 MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100
diff --git a/web/gui/configuraciones_comerciales/configLayoutImpressaoBoleto.zul b/web/gui/configuraciones_comerciales/configLayoutImpressaoBoleto.zul
index e97e6b86a..e86d67b5e 100644
--- a/web/gui/configuraciones_comerciales/configLayoutImpressaoBoleto.zul
+++ b/web/gui/configuraciones_comerciales/configLayoutImpressaoBoleto.zul
@@ -118,6 +118,12 @@
 												value="getSaltoBilhete" label="Salto Bilhete" />
 											<comboitem
 												value="getCorridaExtra" label="Corrida Extra" />
+											<comboitem
+												value="getNsuSitef" label="NSU Sitef" />
+											<comboitem
+												value="getNsuHostSitef" label="NSU Host Sitef" />
+											<comboitem
+												value="getAutorizacaoSitef" label="Autorização Sitef" />
 										</combobox>
 									</row>
 									<row>