shopizer-uncached

diff --git a/pom.xml b/pom.xml
index ca730fc..994caa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 	<sm-core-model.version>2.0.3-SNAPSHOT</sm-core-model.version>
 	<sm-core-modules.version>2.0.3-SNAPSHOT</sm-core-modules.version>
 	<sm-search.version>0.0.5</sm-search.version>
-    <sm-shipping-distance-processor.version>2.0.3</sm-shipping-distance-processor.version>
+  <sm-shipping-distance-processor.version>2.0.3</sm-shipping-distance-processor.version>
 	<sm-shop.version>2.0.3-SNAPSHOT</sm-shop.version>
 	
 	<shopizer-canadapost.version>0.0.1</shopizer-canadapost.version>	

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 4638043..1bcc83c 100755
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -32,7 +32,7 @@
         <gson.version>2.3.1</gson.version>
 		
 		<jasperreports-version>3.7.4</jasperreports-version>
-		
+		<infinispan.version>5.3.0.Final</infinispan.version>
 		<freemarker.version>2.3.19</freemarker.version>
 		<org.slf4j-version>1.6.6</org.slf4j-version>
 		<hibernate.ehcache.version>3.5.1-Final</hibernate.ehcache.version>
@@ -349,19 +349,19 @@
   		<dependency>
 			<groupId>org.infinispan</groupId>
     		<artifactId>infinispan-core</artifactId>
-    		<version>5.1.6.FINAL</version>
+    		<version>${infinispan.version}</version>  
   		</dependency>
 
 		<dependency>      
 			<groupId>org.infinispan</groupId>      
 			<artifactId>infinispan-cachestore-jdbc</artifactId>      
-			<version>5.1.4.FINAL</version>
+			<version>${infinispan.version}</version>
 		</dependency> 
 		
 		<dependency>
 			<groupId>org.infinispan</groupId>
 			<artifactId>infinispan-tree</artifactId>
-			<version>5.1.6.FINAL</version>
+			<version>${infinispan.version}</version>
 		</dependency>
 
 		<dependency>
@@ -573,6 +573,18 @@
 					<artifactId>maven-assembly-plugin</artifactId>
 					<version>2.3</version>
 				</plugin>
+				<plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-source-plugin</artifactId>
+		<executions>
+			<execution>
+				<id>attach-sources</id>
+				<goals>
+					<goal>jar</goal>
+				</goals>
+			</execution>
+		</executions>
+	   </plugin>
 				<!--
 				<plugin>
 					<groupId>org.bsc.maven</groupId>

diff --git a/sm-core/src/main/resources/cms/infinispan_configuration.xml b/sm-core/src/main/resources/cms/infinispan_configuration.xml
index 4bccb6d..d90650d 100755
--- a/sm-core/src/main/resources/cms/infinispan_configuration.xml
+++ b/sm-core/src/main/resources/cms/infinispan_configuration.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-	xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd"
-
-	xmlns="urn:infinispan:config:5.1">
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" xmlns="urn:infinispan:config:5.3">
 
 	<global>
 	

diff --git a/sm-core/src/main/resources/spring/datasource-c3p0.xml b/sm-core/src/main/resources/spring/datasource-c3p0.xml
index 89d2af9..8901314 100755
--- a/sm-core/src/main/resources/spring/datasource-c3p0.xml
+++ b/sm-core/src/main/resources/spring/datasource-c3p0.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 	
 	<bean id="datasource" class="com.mchange.v2.c3p0.ComboPooledDataSource"
 		p:driverClass="${db.driverClass}" p:jdbcUrl="${db.jdbcUrl}" p:user="${db.user}"

diff --git a/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml b/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
index 2c8fb51..d3d9437 100755
--- a/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
+++ b/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
@@ -4,8 +4,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
 
 		<!-- Shipping pre-processors -->
 		<util:list id="shippingModulePreProcessors" value-type="com.salesmanager.core.modules.integration.shipping.model.ShippingQuotePreProcessModule">

diff --git a/sm-core/src/main/resources/spring/shopizer-core-config.xml b/sm-core/src/main/resources/spring/shopizer-core-config.xml
index 6b99f37..c5a8ae5 100755
--- a/sm-core/src/main/resources/spring/shopizer-core-config.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-config.xml
@@ -2,13 +2,13 @@
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
-   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
+   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
+   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
+   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd
+   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
 
 	
 	

diff --git a/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml b/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml
index 9178535..c2b7119 100755
--- a/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-ehcache.xml
@@ -3,13 +3,13 @@
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
-   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
+   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
+   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
+   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
+   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd
+   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd
    http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring/ehcache-spring-1.2.xsd">
 
 

diff --git a/sm-core/src/main/resources/spring/shopizer-core-modules.xml b/sm-core/src/main/resources/spring/shopizer-core-modules.xml
index 77149d1..5fc3192 100755
--- a/sm-core/src/main/resources/spring/shopizer-core-modules.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-modules.xml
@@ -2,13 +2,13 @@
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
-   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
+   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
+   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
+   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd
+   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
 
 
 	<!-- Shipping integration modules -->

diff --git a/sm-core/src/main/resources/spring/shopizer-core-rules.xml b/sm-core/src/main/resources/spring/shopizer-core-rules.xml
index fbdb545..c7b05a6 100755
--- a/sm-core/src/main/resources/spring/shopizer-core-rules.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-rules.xml
@@ -4,9 +4,9 @@
 	xmlns:drools="http://drools.org/schema/drools-spring"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
    http://drools.org/schema/drools-spring http://anonsvn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.0.0.xsd
-   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
 
 	<!-- Decision table for the the selection of a shipping shipping method -->
 	<!-- from shopizer-shipping-decision-table-module -->

diff --git a/sm-core/src/main/resources/spring/shopizer-search.xml b/sm-core/src/main/resources/spring/shopizer-search.xml
index bfed382..49e8f34 100755
--- a/sm-core/src/main/resources/spring/shopizer-search.xml
+++ b/sm-core/src/main/resources/spring/shopizer-search.xml
@@ -2,7 +2,7 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 
 	<!-- can have different search client for indexing & searching -->
 	<bean id="searchClient" class="com.shopizer.search.utils.SearchClient">

diff --git a/sm-core/src/main/resources/spring/spring-context.xml b/sm-core/src/main/resources/spring/spring-context.xml
index 8edcd48..06e4be0 100755
--- a/sm-core/src/main/resources/spring/spring-context.xml
+++ b/sm-core/src/main/resources/spring/spring-context.xml
@@ -2,13 +2,13 @@
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
-   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
+   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
+   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
+   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd
+   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
 
 	<context:annotation-config />
 	<context:component-scan base-package="com.salesmanager.core.business" />

diff --git a/sm-core-modules/src/main/java/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.java b/sm-core-modules/src/main/java/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.java
new file mode 100644
index 0000000..99401d1
--- /dev/null
+++ b/sm-core-modules/src/main/java/com/salesmanager/core/modules/integration/shipping/model/ShippingQuotePrePostProcessModule.java
@@ -0,0 +1,32 @@
+package com.salesmanager.core.modules.integration.shipping.model;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Locale;
+
+import com.salesmanager.core.business.common.model.Delivery;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.shipping.model.PackageDetails;
+import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
+import com.salesmanager.core.business.shipping.model.ShippingOrigin;
+import com.salesmanager.core.business.shipping.model.ShippingQuote;
+import com.salesmanager.core.business.system.model.IntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+import com.salesmanager.core.modules.integration.IntegrationException;
+
+public interface ShippingQuotePrePostProcessModule {
+
+	String getModuleCode();
+	
+	 public void prePostProcessShippingQuotes(
+	            ShippingQuote quote, 
+	            List<PackageDetails> packages, 
+	            BigDecimal orderTotal, 
+	            Delivery delivery, 
+	            ShippingOrigin origin, 
+	            MerchantStore store, 
+	            IntegrationConfiguration globalShippingConfiguration, 
+	            IntegrationModule currentModule, 
+	            ShippingConfiguration shippingConfiguration, 
+	            List<IntegrationModule> allModules, Locale locale) throws IntegrationException;
+}

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 0f24925..48a9482 100755
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -22,9 +22,9 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<jackson-version>1.9.13</jackson-version>
-		<fasterxml-version>2.2.3</fasterxml-version>
+		<fasterxml-version>2.6.5</fasterxml-version>
 		<org.springframework-version>3.2.16.RELEASE</org.springframework-version>
-		<org.springframework-security-version>3.1.4.RELEASE</org.springframework-security-version>
+		<org.springframework-security-version>3.2.9.RELEASE</org.springframework-security-version>
 		<org.aspectj-version>1.8.7</org.aspectj-version>
 		<org.slf4j-version>1.6.6</org.slf4j-version>
 		<sm-core.jodatime.version>2.0</sm-core.jodatime.version>
@@ -236,6 +236,12 @@
 			<artifactId>jackson-databind</artifactId>
 			<version>${fasterxml-version}</version>
 		</dependency>
+		
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>${fasterxml-version}</version>
+	  </dependency>
 
 		<!-- Rome Atom+RSS -->
 		<dependency>

diff --git a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
index 4025170..5bd9be2 100755
--- a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/controllers.xml
@@ -4,17 +4,22 @@
 	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
-		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd
+		http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd">
 
 	
 	<context:annotation-config />
+	
+		
+	
 	<context:component-scan base-package="com.salesmanager.web" />
 	<context:component-scan base-package="com.salesmanager.core.business" />
 	<context:component-scan base-package="com.salesmanager.core.utils" />
 	
+
+	
 	<!-- Async -->
 	<bean id="executorService" class="java.util.concurrent.Executors"
     	factory-method="newFixedThreadPool">
@@ -37,6 +42,10 @@
 	</bean>
 	-->
 	
+	
+
+<mvc:annotation-driven content-negotiation-manager="contentNegotiationManager"/>
+	
 	<!-- Maps '/' requests to the 'home' view -->
 	<mvc:view-controller path="/" view-name="shop"/>
 	

diff --git a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
index 8b932d9..94bf749 100755
--- a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
@@ -5,15 +5,15 @@
 	xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="
-        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
-        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
+        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+        http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd
+        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
 
 	<!-- DispatcherServlet Context: defines this servlet's request-processing infrastructure -->
 
 	<!-- Enables the Spring MVC @Controller programming model -->
-	<annotation-driven>
+	<annotation-driven content-negotiation-manager="contentNegotiationManager">
 
 		<!-- Device object in controller method -->
 		<argument-resolvers>
@@ -33,6 +33,11 @@
     	</message-converters>
 
 	</annotation-driven>
+	
+	<beans:bean id="contentNegotiationManager" class="org.springframework.web.accept.ContentNegotiationManagerFactoryBean">
+    <!-- Turn off working out content type based on URL file extension, should fall back to looking at the Accept headers -->
+    	<beans:property name="favorPathExtension" value="false" />
+    </beans:bean>
 
 	<!-- Handles HTTP GET requests for /resources/** by efficiently serving up static resources in the ${webappRoot}/resources/ directory -->
 	<resources mapping="/resources/**" location="/resources/" />

diff --git a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-properties.xml b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-properties.xml
index cae2437..f24c1df 100755
--- a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-properties.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-properties.xml
@@ -2,13 +2,13 @@
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:task="http://www.springframework.org/schema/task"
 	xmlns:util="http://www.springframework.org/schema/util"
 	xsi:schemaLocation="
-   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd
-   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.1.xsd
-   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd">
+   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.2.xsd
+   http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd
+   http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.2.xsd
+   http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
+   http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.2.xsd
+   http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.2.xsd">
 
 	
 	<!-- 

diff --git a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-security.xml b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-security.xml
index 68feb68..478a951 100755
--- a/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-security.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/spring/appServlet/shopizer-security.xml
@@ -1,11 +1,11 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security"
 	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+	http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
 	http://www.springframework.org/schema/jdbc
-	http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
+	http://www.springframework.org/schema/jdbc/spring-jdbc-3.2.xsd
 	http://www.springframework.org/schema/security
-	http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+	http://www.springframework.org/schema/security/spring-security-3.2.xsd">
 
 
 	<global-method-security secured-annotations="enabled" jsr250-annotations="enabled" pre-post-annotations="enabled"/>

diff --git a/sm-shop/src/main/webapp/WEB-INF/spring/root-context.xml b/sm-shop/src/main/webapp/WEB-INF/spring/root-context.xml
index 2982314..e5f58b4 100755
--- a/sm-shop/src/main/webapp/WEB-INF/spring/root-context.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/spring/root-context.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd">
 	
 	<!-- Root Context: defines shared resources visible to all other web components -->