From b8cfed1a2593bb1b8055f7ad021a76d0115bbf35 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <paulo@pveiga.com.ar>
Date: Fri, 11 Mar 2011 01:42:28 -0300
Subject: [PATCH] Split Spring loading.

---
 wise-webapp/src/main/webapp/WEB-INF/web.xml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/wise-webapp/src/main/webapp/WEB-INF/web.xml b/wise-webapp/src/main/webapp/WEB-INF/web.xml
index b7f53b8f..d383bfbb 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/web.xml
@@ -14,11 +14,9 @@
         <param-name>contextConfigLocation</param-name>
         <param-value>
             /WEB-INF/wisemapping-security.xml
-            /WEB-INF/wisemapping-dao.xml                                    
+            /WEB-INF/wisemapping-dao.xml
             /WEB-INF/wisemapping-service.xml
             /WEB-INF/wisemapping-model.xml
-            /WEB-INF/wisemapping-servlet.xml
-            /WEB-INF/wisemapping-captcha.xml
             /WEB-INF/wisemapping-acegi-security.xml
         </param-value>
     </context-param>
@@ -89,6 +87,15 @@
         <servlet-name>wisemapping</servlet-name>
         <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
+
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>
+                /WEB-INF/wisemapping-servlet.xml
+                /WEB-INF/wisemapping-captcha.xml
+            </param-value>
+        </init-param>
+
     </servlet>
 
     <servlet>
@@ -118,12 +125,4 @@
     <session-config>
         <session-timeout>180</session-timeout>
     </session-config>
-
-
-    <!-- This should be revired -->
-    <!--<resource-ref>-->
-    <!--<res-ref-name>jdbc/wisemapping</res-ref-name>-->
-    <!--<res-type>javax.sql.DataSource</res-type>-->
-    <!--<res-auth>Container</res-auth>-->
-    <!--</resource-ref>-->
 </web-app>
\ No newline at end of file