From 6496166f70cc2ab5aead5a481c2becdcdde8aa04 Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Fri, 21 Dec 2012 18:24:03 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@23326
 d1611594-4594-4d17-8e1d-87c2c4800839

---
 src/java/spring-config.xml       | 33 +++++++++++++++-----------------
 web/WEB-INF/i3-label_pt_BR.label |  2 +-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml
index 578d5cd8a..9ef95e60c 100644
--- a/src/java/spring-config.xml
+++ b/src/java/spring-config.xml
@@ -284,14 +284,11 @@
 				<value>com.rjconsultores.ventaboletos.entidad.Zona</value>
 				<value>com.rjconsultores.ventaboletos.entidad.ParamArticulo</value>
 				<value>com.rjconsultores.ventaboletos.entidad.EventoExtra</value>
-				<value>com.rjconsultores.ventaboletos.entidad.TipoEventoExtra
-				</value>
-				<value>com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra
-				</value>
+				<value>com.rjconsultores.ventaboletos.entidad.TipoEventoExtra</value>
+				<value>com.rjconsultores.ventaboletos.entidad.AjusteEventoExtra</value>
 				<value>com.rjconsultores.ventaboletos.entidad.TarjetaViaje</value>
 				<value>com.rjconsultores.ventaboletos.entidad.Cliente</value>
-				<value>com.rjconsultores.ventaboletos.entidad.ClienteDireccion
-				</value>
+				<value>com.rjconsultores.ventaboletos.entidad.ClienteDireccion</value>
 			</list>
 		</property>
 
@@ -304,7 +301,7 @@
 			</props>
 		</property>
 	</bean>
-
+ 
 	<bean id="transactionManager"
 		class="org.springframework.orm.hibernate3.HibernateTransactionManager">
 		<property name="sessionFactory" ref="sessionFactory" />
@@ -314,19 +311,19 @@
 		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}" /> -->
-<!-- 	</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}" />
+	<bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+		<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}" /> -->
+<!-- 	</bean> -->
+
 	<!-- ====================================================== -->
 	<!-- Search class from Hibernate-Generic-DAO framework -->
 	<!-- ====================================================== -->
diff --git a/web/WEB-INF/i3-label_pt_BR.label b/web/WEB-INF/i3-label_pt_BR.label
index d19cc0a9a..b285d1a32 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_20121221_1RC93
+versao = ADM_20121221_1RC94
 
 # MSG Defaut:
 MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100