From 442a89631de25bbb1d74e9cb46056a89d2bfbfc2 Mon Sep 17 00:00:00 2001
From: rodrigo <rodrigo@d1611594-4594-4d17-8e1d-87c2c4800839>
Date: Tue, 16 Oct 2012 22:21:48 +0000
Subject: [PATCH] git-svn-id:
 http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@22111
 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 081673994..4e37ab37b 100644
--- a/src/java/spring-config.xml
+++ b/src/java/spring-config.xml
@@ -299,19 +299,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 8d6785634..4b190e62d 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_201210028_1RC72
+versao = ADM_20121016_1RC74
 
 # MSG Defaut:
 MSG.CONSTRAINT.PORCENTAGEM = Os valores devem estar entre 0 e 100