From d63b36f8382984078636fe837fd484a45a050c95 Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Thu, 1 Nov 2012 20:45:36 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@22369
 d1611594-4594-4d17-8e1d-87c2c4800839

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

diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml
index b9fa93a58..5b24c9302 100644
--- a/src/java/spring-config.xml
+++ b/src/java/spring-config.xml
@@ -310,19 +310,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 4b0938715..574428f61 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_20121031_1RC78
+versao = ADM_20121101_1RC79
 
 # MSG Defaut:
 MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100