shopizer-uncached

diff --git a/pom.xml b/pom.xml
index eac8a05..7a08fe1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,7 @@
 		<org.elasticsearch-version>2.4.1</org.elasticsearch-version>
 		<infinispan.version>6.0.2.Final</infinispan.version>
 		<mysql-jdbc-version>5.1.40</mysql-jdbc-version>
-        <!-- DON'T AS IT OVERWRITES SPRING -->
-        <!--<spring.version>4.2.1.RELEASE</spring.version>-->
-        <!--<spring-data.version>Gosling-RELEASE</spring-data.version>-->
+		<simple-json-version>1.1.1</simple-json-version>
     </properties>
 
     <dependencies>
@@ -78,9 +76,7 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>${mysql-jdbc-version}</version>
 		</dependency>
-		
 
-		
 				<!-- Jackson JSON Processor -->
 				<dependency>
 				    <groupId>com.fasterxml.jackson.core</groupId>
@@ -131,6 +127,13 @@
 		    <groupId>javax.mail</groupId>
 		    <artifactId>mail</artifactId>
 		    <version>1.4.7</version>
+		</dependency>
+		
+		<!-- http://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
+		<dependency>
+		    <groupId>com.googlecode.json-simple</groupId>
+		    <artifactId>json-simple</artifactId>
+		    <version>${simple-json-version}</version>
 		</dependency>	
 		
     </dependencies>

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 47a2293..21ab413 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Jan 05 09:25:11 EST 2017
+#Mon Jan 09 13:28:17 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 8de083f..69fc318 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Jan 05 12:13:33 EST 2017
+#Mon Jan 09 13:28:18 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 14186b7..4d7763b 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -112,6 +112,9 @@
 		    <version>${commons-collections4.version}</version>
 		</dependency>
 		
+
+		
+		
 		<!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
 		<dependency>
 		    <groupId>commons-validator</groupId>

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java
index 530e082..e1965e1 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/configuration/CoreApplicationConfiguration.java
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.ImportResource;
 @EnableAutoConfiguration
 @EntityScan(basePackages = {"com.salesmanager.core.model"})
 @ComponentScan({"com.salesmanager.core.business.services","com.salesmanager.core.business.utils"})
-@ImportResource("spring/shopizer-core-context.xml")
+@ImportResource("classpath:/spring/shopizer-core-context.xml")
 public class CoreApplicationConfiguration {
 
 }

diff --git a/sm-core/src/main/resources/configs.properties b/sm-core/src/main/resources/configs.properties
index 65f706b..b3f007a 100644
--- a/sm-core/src/main/resources/configs.properties
+++ b/sm-core/src/main/resources/configs.properties
@@ -7,7 +7,7 @@ secretKey=7070200000000007
 elasticsearch.cluster.name=shopizer
 elasticsearch.mode=remote
 elasticsearch.server.host=http://localhost
-elasticsearch.server.port =9200
+elasticsearch.server.port=9200
 elasticsearch.server.proxy.user=
 elasticsearch.server.proxy.password=
 

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 4f001c2..92b6f54 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Jan 05 12:13:40 EST 2017
+#Mon Jan 09 13:28:22 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 851110e..8d2c783 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -17,12 +17,8 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<!-- testing properties -->
-		<!--<dbh2.version>1.4.187</dbh2.version>-->
 		<main.basedir>${basedir}/../..</main.basedir>
         <m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
-
-
 	</properties>
 
 	<dependencies>

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 4a0a8f1..17f7ffe 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ

diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index 9e1dc99..c34c800 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Thu Jan 05 13:01:50 EST 2017
-id=1596fcb41afecea71330662d56c999ae5e5ddb7766f
+#Mon Jan 09 13:29:58 EST 2017
+id=159847e72101e022f24e44d27ccb8396885264ed42f
 method=file

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
index b2a1d67..fb50f78 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
@@ -1,44 +1,27 @@
 package com.salesmanager.shop.application;
 
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.web.accept.ContentNegotiationManager;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-import org.springframework.web.servlet.view.ContentNegotiatingViewResolver;
 import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 import org.springframework.web.servlet.view.tiles3.TilesView;
 import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.salesmanager.core.business.configuration.CoreApplicationConfiguration;
 
 @Configuration
 @ComponentScan({"com.salesmanager.shop","com.salesmanager.core.business"})
 @EnableAutoConfiguration
 @Import(CoreApplicationConfiguration.class)//import sm-core configurations
-@ImportResource("spring/shopizer-shop-context.xml")
+@ImportResource("classpath:/spring/shopizer-shop-context.xml")
 @EnableWebSecurity
 public class ShopApplicationConfiguration extends WebMvcConfigurerAdapter{
-	
-	private static final Charset UTF8 = Charset.forName("UTF-8");
-	
+
     /**
      * Configure TilesConfigurer.
      */
@@ -61,69 +44,6 @@ public class ShopApplicationConfiguration extends WebMvcConfigurerAdapter{
         return resolver;
     }
     
-    //https://spring.io/blog/2013/05/11/content-negotiation-using-spring-mvc/
-    //https://spring.io/blog/2013/06/03/content-negotiation-using-views
-    
-/*    
-     * Configure ContentNegotiationManager
-     
-    @Override
-    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
-        configurer.ignoreAcceptHeader(true).defaultContentType(
-                MediaType.TEXT_HTML);
-    }*/
-    
-/*    
-     * Configure ContentNegotiatingViewResolver
-     
-    @Bean
-    public ViewResolver contentNegotiatingViewResolver(ContentNegotiationManager manager) {
-        ContentNegotiatingViewResolver resolver = new ContentNegotiatingViewResolver();
-        resolver.setContentNegotiationManager(manager);
- 
-        // Define all possible view resolvers
-        List<ViewResolver> resolvers = new ArrayList<ViewResolver>();
- 
-
-        resolvers.add(jsonViewResolver());
-        resolvers.add(jspViewResolver());
-
-         
-        resolver.setViewResolvers(resolvers);
-        return resolver;
-    }*/
-    
-/*    
-     * Configure View resolver to provide JSON output using JACKSON library to
-     * convert object in JSON format.
-     
-    @Bean
-    public ViewResolver jsonViewResolver() {
-        return new JsonViewResolver();
-    }*/
-    
-/*    @Override
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-      StringHttpMessageConverter stringConverter = new StringHttpMessageConverter();
-      stringConverter.setSupportedMediaTypes(Arrays.asList(new MediaType("application", "json", UTF8)));
-      converters.add(stringConverter);
 
-      // Add other converters ...
-    }*/
-    
-/*    *//**
-     * Spring 4 JSON converter
-     *//*
-    @Override
-    public void extendMessageConverters(List<HttpMessageConverter<?>> converters) {
-        converters.add(mappingJackson2HttpMessageConverter());
-    }
-     
-    @Bean
-    public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter() {
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
-        converter.setObjectMapper(new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false));
-        return converter;
-    }*/
 
 }