From 1b9bf8f41462c595a547d8e83955cd8b32ce293b Mon Sep 17 00:00:00 2001
From: gleimar <gleimar@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Wed, 5 Sep 2012 22:10:59 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@21090
 d1611594-4594-4d17-8e1d-87c2c4800839

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

diff --git a/src/java/spring-config.xml b/src/java/spring-config.xml
index 1b9d49c3f..53a7f78b7 100644
--- a/src/java/spring-config.xml
+++ b/src/java/spring-config.xml
@@ -219,18 +219,18 @@
 	<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}" /> -->
-<!-- 	</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 d5f8652b3..05f0a5609 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_20120831_1RC60
+versao = ADM_20120905_1RC61
 
 # MSG Defaut:
 MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100