shopizer-uncached

diff --git a/pom.xml b/pom.xml
index bb119f5..425fbba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <shopizer.search.version>2.5.0-SNAPSHOT</shopizer.search.version>
         <shopizer-canadapost.version>2.5.0-SNAPSHOT</shopizer-canadapost.version>
 		<shopizer-shipping-distance.version>2.5.0-SNAPSHOT</shopizer-shipping-distance.version>	
-        
+        <jackson-version>2.7.4</jackson-version>
         
         <spring-mobile-device-version>1.1.4.RELEASE</spring-mobile-device-version>
         <commons-collections4.version>4.0</commons-collections4.version>
@@ -60,12 +60,36 @@
 		    <version>1.1.0.Final</version>
 		</dependency>
 		
+
 		
-		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
-		<dependency>
-		    <groupId>com.fasterxml.jackson.core</groupId>
-		    <artifactId>jackson-core</artifactId>
-		</dependency>
+				<!-- Jackson JSON Processor -->
+				<dependency>
+				    <groupId>com.fasterxml.jackson.core</groupId>
+				    <artifactId>jackson-databind</artifactId>
+				    <version>${jackson-version}</version>
+				    <exclusions>
+				        <exclusion>
+				            <groupId>com.fasterxml.jackson.core</groupId>
+				            <artifactId>jackson-core</artifactId>
+				        </exclusion>
+				        <exclusion>
+				            <groupId>com.fasterxml.jackson.core</groupId>
+				            <artifactId>jackson-annotations</artifactId>
+				        </exclusion>
+				    </exclusions>
+				</dependency>
+				<dependency>
+				    <groupId>com.fasterxml.jackson.core</groupId>
+				    <artifactId>jackson-core</artifactId>
+				    <version>${jackson-version}</version>
+				</dependency>
+				 
+				<dependency>
+				    <groupId>com.fasterxml.jackson.core</groupId>
+				    <artifactId>jackson-annotations</artifactId>
+				    <version>${jackson-version}</version>
+				</dependency>
+						
 		
 		<!-- https://mvnrepository.com/artifact/net.sf.ehcache/ehcache -->
 		<dependency>

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 854fbee..8c90811 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
-#Mon Nov 07 09:14:48 EST 2016
+#Mon Nov 07 12:23:18 EST 2016
 version=2.5.0-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 289e0af..9c2bf7b 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
-#Mon Nov 07 09:14:47 EST 2016
+#Mon Nov 07 12:23:17 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/files/store/StoreRepository.dat b/sm-core/files/store/StoreRepository.dat
index 8da2fe1..819e524 100644
Binary files a/sm-core/files/store/StoreRepository.dat and b/sm-core/files/store/StoreRepository.dat differ

diff --git a/sm-core/SALESMANAGER-TEST.h2.db b/sm-core/SALESMANAGER-TEST.h2.db
index 9f60507..dd1b2f2 100644
Binary files a/sm-core/SALESMANAGER-TEST.h2.db and b/sm-core/SALESMANAGER-TEST.h2.db differ

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java
index 3781625..1be944f 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/modules/utils/GeoLocationImpl.java
@@ -10,6 +10,12 @@ import com.maxmind.geoip2.model.CityResponse;
 import com.salesmanager.core.model.common.Address;
 import com.salesmanager.core.modules.utils.GeoLocation;
 
+/**
+ * Using Geolite2 City database
+ * http://dev.maxmind.com/geoip/geoip2/geolite2/#Databases
+ * @author c.samson
+ *
+ */
 public class GeoLocationImpl implements GeoLocation {
 	
 	private DatabaseReader reader = null;
@@ -21,7 +27,7 @@ public class GeoLocationImpl implements GeoLocation {
 		
 			if(reader==null) {
 					try {
-						java.io.InputStream inputFile = GeoLocationImpl.class.getClassLoader().getResourceAsStream("reference/GeoLite2-Country.mmdb");
+						java.io.InputStream inputFile = GeoLocationImpl.class.getClassLoader().getResourceAsStream("reference/GeoLite2-City.mmdb");
 						reader = new DatabaseReader.Builder(inputFile).build();
 					} catch(Exception e) {
 						LOGGER.error("Cannot instantiate IP database",e);

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepository.java
index fd9ab2e..5e691c4 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/content/ContentRepository.java
@@ -6,21 +6,22 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
 import com.salesmanager.core.model.content.Content;
+import com.salesmanager.core.model.content.ContentType;
 
 public interface ContentRepository extends JpaRepository<Content, Long>,  ContentRepositoryCustom  {
 
 	
 	@Query("select c from Content c left join fetch c.descriptions cd join fetch c.merchantStore cm where c.contentType = ?1 and cm.id = ?2 and cd.language.id = ?3 order by c.sortOrder asc")
-	List<Content> findByType(String contentType, Integer storeId, Integer languageId);
+	List<Content> findByType(ContentType contentType, Integer storeId, Integer languageId);
 	
 	@Query("select c from Content c left join fetch c.descriptions cd join fetch c.merchantStore cm where c.contentType = ?1 and cm.id = ?2 order by c.sortOrder asc")
-	List<Content> findByType(String contentType, Integer storeId);
+	List<Content> findByType(ContentType contentType, Integer storeId);
 	
 	@Query("select c from Content c left join fetch c.descriptions cd join fetch c.merchantStore cm where c.contentType in (?1) and cm.id = ?2 and cd.language.id = ?3 order by c.sortOrder asc")
-	List<Content> findByTypes(List<String> contentTypes, Integer storeId, Integer languageId);
+	List<Content> findByTypes(List<ContentType> contentTypes, Integer storeId, Integer languageId);
 	
 	@Query("select c from Content c left join fetch c.descriptions cd join fetch c.merchantStore cm where c.contentType in (?1) and cm.id = ?2 order by c.sortOrder asc")
-	List<Content> findByTypes(List<String> contentTypes, Integer storeId);
+	List<Content> findByTypes(List<ContentType> contentTypes, Integer storeId);
 	
 	@Query("select c from Content c left join fetch c.descriptions cd join fetch c.merchantStore cm where c.code = ?1 and cm.id = ?2")
 	Content findByCode(String code, Integer storeId);

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/system/MerchantConfigurationRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/system/MerchantConfigurationRepository.java
index 1820536..b3c67d1 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/system/MerchantConfigurationRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/system/MerchantConfigurationRepository.java
@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
 import com.salesmanager.core.model.system.MerchantConfiguration;
+import com.salesmanager.core.model.system.MerchantConfigurationType;
 
 public interface MerchantConfigurationRepository extends JpaRepository<MerchantConfiguration, Long> {
 
@@ -20,5 +21,5 @@ public interface MerchantConfigurationRepository extends JpaRepository<MerchantC
 	MerchantConfiguration findByMerchantStoreAndKey(Integer id, String key);
 	
 	@Query("select m from MerchantConfiguration m join fetch m.merchantStore ms where ms.id=?1 and m.merchantConfigurationType=?2")
-	List<MerchantConfiguration> findByMerchantStoreAndType(Integer id, String type);
+	List<MerchantConfiguration> findByMerchantStoreAndType(Integer id, MerchantConfigurationType type);
 }

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java
index 35f3389..b00dd4f 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/content/ContentServiceImpl.java
@@ -1,6 +1,5 @@
 package com.salesmanager.core.business.services.content;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -54,7 +53,7 @@ public class ContentServiceImpl
         throws ServiceException
     {
 
-        return contentRepository.findByType( contentType.name(), store.getId(), language.getId() );
+        return contentRepository.findByType( contentType, store.getId(), language.getId() );
     }
     
     @Override
@@ -78,12 +77,12 @@ public class ContentServiceImpl
         throws ServiceException
     {
 
-    	List<String> contentTypes = new ArrayList<String>();
+/*    	List<String> contentTypes = new ArrayList<String>();
     	for (int i = 0; i < contentType.size(); i++) {
     		contentTypes.add(contentType.get(i).name());
-        }
+        }*/
     	
-        return contentRepository.findByTypes( contentTypes, store.getId(), language.getId() );
+        return contentRepository.findByTypes( contentType, store.getId(), language.getId() );
     }
     
     @Override
@@ -99,12 +98,12 @@ public class ContentServiceImpl
     public List<Content> listByType(  List<ContentType> contentType,  MerchantStore store )
     throws ServiceException
     {
-    	List<String> contentTypes = new ArrayList<String>();
+/*    	List<String> contentTypes = new ArrayList<String>();
     	for (int i = 0; i < contentType.size(); i++) {
     		contentTypes.add(contentType.get(i).name());
-        }
+        }*/
 
-	    return contentRepository.findByTypes( contentTypes, store.getId() );
+	    return contentRepository.findByTypes( contentType, store.getId() );
     }
 
     @Override

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
index 0fae3e9..f0d8fe9 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
@@ -43,7 +43,7 @@ public class MerchantConfigurationServiceImpl extends
 	
 	@Override
 	public List<MerchantConfiguration> listByType(MerchantConfigurationType type, MerchantStore store) throws ServiceException {
-		return merchantConfigurationRepository.findByMerchantStoreAndType(store.getId(), type.name());
+		return merchantConfigurationRepository.findByMerchantStoreAndType(store.getId(), type);
 	}
 	
 	@Override

diff --git a/sm-core/src/main/resources/reference/GeoLite2-City.mmdb b/sm-core/src/main/resources/reference/GeoLite2-City.mmdb
new file mode 100644
index 0000000..e97f1c2
Binary files /dev/null and b/sm-core/src/main/resources/reference/GeoLite2-City.mmdb differ

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 4f8c0c1..756b32e 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
-#Mon Nov 07 09:14:49 EST 2016
+#Mon Nov 07 12:23:18 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 1f1bbf3..6b0bebd 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 aafaa8e..0a859ec 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Mon Nov 07 09:56:14 EST 2016
-id=1583f4a29a90beedf935274b79efdcaee5c3463649f
+#Mon Nov 07 13:05:54 EST 2016
+id=1583ff7c722aff5978fa2bdea91feef9112c871b4be
 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 6421d41..7490a68 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
@@ -9,6 +9,7 @@ import org.springframework.context.annotation.ImportResource;
 import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 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.salesmanager.core.business.configuration.CoreApplicationConfiguration;
@@ -35,10 +36,17 @@ public class ShopApplicationConfiguration extends WebMvcConfigurerAdapter{
     /**
      * Configure ViewResolvers to deliver preferred views.
      */
-    @Override
+/*    @Override
     public void configureViewResolvers(ViewResolverRegistry registry) {
         TilesViewResolver viewResolver = new TilesViewResolver();
         registry.viewResolver(viewResolver);
+    }*/
+    
+    @Bean
+    public TilesViewResolver tilesViewResolver() {
+        final TilesViewResolver resolver = new TilesViewResolver();
+        resolver.setViewClass(TilesView.class);
+        return resolver;
     }
 
 }

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
index a7da273..b89181d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
@@ -883,13 +883,13 @@ public class StoreFilter extends HandlerInterceptorAdapter {
 	   @SuppressWarnings("unused")
 	private Map<String,Object> getConfigurations(MerchantStore store) {
 		   
-		   Map<String,Object> configs = null;
+		   Map<String,Object> configs = configs = new HashMap<String,Object>();
 		   try {
 			   
 			   List<MerchantConfiguration> merchantConfiguration = merchantConfigurationService.listByType(MerchantConfigurationType.CONFIG, store);
 			   
-			   if(!CollectionUtils.isEmpty(merchantConfiguration) && configs==null) {
-				   configs = new HashMap<String,Object>();
+			   if(CollectionUtils.isEmpty(merchantConfiguration)) {
+				   return configs;
 			   }
 			   
 			   

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java
index 5bca523..9a113a0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/AbstractController.java
@@ -3,17 +3,11 @@
  */
 package com.salesmanager.shop.store.controller;
 
+import javax.servlet.http.HttpServletRequest;
+
 import com.salesmanager.core.model.reference.language.Language;
 import com.salesmanager.shop.constants.Constants;
 import com.salesmanager.shop.store.model.paging.PaginationData;
-import org.jopendocument.util.ExceptionUtils;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * @author Umesh A
@@ -46,86 +40,7 @@ public abstract class AbstractController {
     protected Language getLanguage(HttpServletRequest request) {
     	return (Language)request.getAttribute(Constants.LANGUAGE);
     }
-    
-	@ExceptionHandler(Exception.class)
-	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
-	public ModelAndView handleException(Exception ex) {
-		
-		ModelAndView model = null;
-		if(ex instanceof AccessDeniedException) {
-			
-			model = new ModelAndView("error/access_denied");
-			
-		} else {
-			
-			model = new ModelAndView("error/generic_error");
-			model.addObject("stackError", ExceptionUtils.getStackTrace(ex));
-			model.addObject("errMsg", ex.getMessage());
-			
-		}
-		
-		
- 
-		return model;
- 
-	}
-    
 
- /*   
-	@ExceptionHandler(Exception.class)
-	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
-	public String handleException(Model model, Exception ex, HttpServletRequest request) {
-		
-		
-		MerchantStore store = getSessionAttribute(Constants.MERCHANT_STORE, request);
-		StringBuilder template = null;
-		//ModelAndView model = null;
-		if(ex instanceof AccessDeniedException) {
-			
-			
-			if(store != null) {
-			
-				
-				template = new StringBuilder().append(ControllerConstants.Tiles.Error.accessDenied).append(".").append(store.getStoreTemplate());
-				
-				
-			} else {
-				
-				template = new StringBuilder().append(ControllerConstants.Tiles.Error.accessDenied);
-				
-			}
-			
-			//model = new ModelAndView("error/access_denied");
-			
-		} else {
-			
-			model.addAttribute("stackError", ExceptionUtils.getStackTrace(ex));
-			model.addAttribute("errMsg", ex.getMessage());
-			
-			if(store != null) {
-			
-				
-				template = new StringBuilder().append(ControllerConstants.Tiles.Error.error).append(".").append(store.getStoreTemplate());
-				
-				
-			} else {
-				
-				template = new StringBuilder().append(ControllerConstants.Tiles.Error.error);
-				
-			}
-			
-			//model = new ModelAndView("error/generic_error");
-			//model.addObject("stackError", ExceptionUtils.getStackTrace(ex));
-			//model.addObject("errMsg", ex.getMessage());
-			
-		}
-		
-		
- 
-		return template.toString();
- 
-	}
-*/
     protected PaginationData createPaginaionData( final int pageNumber, final int pageSize )
     {
         final PaginationData paginaionData = new PaginationData(pageSize,pageNumber);

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
new file mode 100644
index 0000000..d6ccfbe
--- /dev/null
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/error/ErrorController.java
@@ -0,0 +1,113 @@
+package com.salesmanager.shop.store.controller.error;
+
+import org.jopendocument.util.ExceptionUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.ModelAndView;
+
+@ControllerAdvice
+public class ErrorController {
+	
+    
+	@ExceptionHandler(Exception.class)
+	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
+	public ModelAndView handleException(Exception ex) {
+		
+		ModelAndView model = null;
+		if(ex instanceof AccessDeniedException) {
+			
+			model = new ModelAndView("error/access_denied");
+			
+		} else {
+			
+			model = new ModelAndView("error/generic_error");
+			model.addObject("stackError", ExceptionUtils.getStackTrace(ex));
+			model.addObject("errMsg", ex.getMessage());
+			
+		}
+		
+		
+ 
+		return model;
+ 
+	}
+	
+	@ExceptionHandler(RuntimeException.class)
+	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
+	public ModelAndView handleRuntimeException(Exception ex) {
+		
+		ModelAndView model = null;
+
+			
+		model = new ModelAndView("error/generic_error");
+		model.addObject("stackError", ExceptionUtils.getStackTrace(ex));
+		model.addObject("errMsg", ex.getMessage());
+
+		
+		
+ 
+		return model;
+ 
+	}
+    
+
+ /*   
+	@ExceptionHandler(Exception.class)
+	@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR)
+	public String handleException(Model model, Exception ex, HttpServletRequest request) {
+		
+		
+		MerchantStore store = getSessionAttribute(Constants.MERCHANT_STORE, request);
+		StringBuilder template = null;
+		//ModelAndView model = null;
+		if(ex instanceof AccessDeniedException) {
+			
+			
+			if(store != null) {
+			
+				
+				template = new StringBuilder().append(ControllerConstants.Tiles.Error.accessDenied).append(".").append(store.getStoreTemplate());
+				
+				
+			} else {
+				
+				template = new StringBuilder().append(ControllerConstants.Tiles.Error.accessDenied);
+				
+			}
+			
+			//model = new ModelAndView("error/access_denied");
+			
+		} else {
+			
+			model.addAttribute("stackError", ExceptionUtils.getStackTrace(ex));
+			model.addAttribute("errMsg", ex.getMessage());
+			
+			if(store != null) {
+			
+				
+				template = new StringBuilder().append(ControllerConstants.Tiles.Error.error).append(".").append(store.getStoreTemplate());
+				
+				
+			} else {
+				
+				template = new StringBuilder().append(ControllerConstants.Tiles.Error.error);
+				
+			}
+			
+			//model = new ModelAndView("error/generic_error");
+			//model.addObject("stackError", ExceptionUtils.getStackTrace(ex));
+			//model.addObject("errMsg", ex.getMessage());
+			
+		}
+		
+		
+ 
+		return template.toString();
+ 
+	}
+*/
+
+}

diff --git a/sm-shop/src/main/resources/application.properties b/sm-shop/src/main/resources/application.properties
new file mode 100644
index 0000000..25795b4
--- /dev/null
+++ b/sm-shop/src/main/resources/application.properties
@@ -0,0 +1,2 @@
+spring.view.prefix: /WEB-INF/jsp/
+spring.view.suffix: .jsp
\ No newline at end of file

diff --git a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
index d6b4761..44f1a2c 100644
--- a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
@@ -12,10 +12,10 @@
 
 
 	<!-- Resolves views selected for rendering by @Controllers to .jsp resources in the /WEB-INF/views directory -->
-	<beans:bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+<!-- 	<beans:bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<beans:property name="prefix" value="/WEB-INF/views/" />
 		<beans:property name="suffix" value=".jsp" />
-	</beans:bean>
+	</beans:bean> -->
 	
 
 	<!-- Only needed because we require fileupload in the org.springframework.samples.mvc.fileupload package -->

diff --git a/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-admin.xml b/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-admin.xml
index 5f5cc93..51d85af 100644
--- a/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-admin.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-admin.xml
@@ -1,29 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?> 
-<!-- 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
---> 
-<!DOCTYPE tiles-definitions PUBLIC
-         "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-         "http://struts.apache.org/dtds/tiles-config_2_0.dtd">
- 
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE tiles-definitions PUBLIC  
+        "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"  
+        "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
 
 <tiles-definitions>
  	<definition name="admin-dashboard" template="/layout/admin/layout.jsp">

diff --git a/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-shop.xml b/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-shop.xml
index f9bcd65..1f6ff6e 100644
--- a/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-shop.xml
+++ b/sm-shop/src/main/webapp/WEB-INF/tiles/tiles-shop.xml
@@ -1,29 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?> 
-<!-- 
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
---> 
-<!DOCTYPE tiles-definitions PUBLIC
-         "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
-         "http://struts.apache.org/dtds/tiles-config_2_0.dtd">
- 
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE tiles-definitions PUBLIC  
+        "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN"  
+        "http://tiles.apache.org/dtds/tiles-config_3_0.dtd">
 
 <tiles-definitions>
  	

diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java
index a32e304..71a1bf8 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java
@@ -16,6 +16,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
+@Ignore
 public class CategoryManagementAPITest {
 	
 	private RestTemplate restTemplate;

diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java
index 48ba352..6a4af9d 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java
@@ -20,7 +20,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
-
+@Ignore
 public class CustomerRESTControllerTest {
 	
 	private RestTemplate restTemplate;

diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java
index b679d3a..a2c847c 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java
@@ -26,6 +26,8 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 
+
+@Ignore
 public class ProductManagementAPITest {
 	
 	private RestTemplate restTemplate;

diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java
index 1b24382..b9bb1dd 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java
@@ -11,6 +11,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.Charset;
 
+@Ignore
 public class ContactAPITest {
 	
 	private RestTemplate restTemplate;

diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/system/rest/SystemAPITest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/system/rest/SystemAPITest.java
index 115c6b1..16e1695 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/system/rest/SystemAPITest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/system/rest/SystemAPITest.java
@@ -8,6 +8,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.nio.charset.Charset;
 
+@Ignore
 public class SystemAPITest {
 	
 	private RestTemplate restTemplate;

diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index 5fb99b6..7d2e6cf 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Nov 07 09:14:52 EST 2016
+#Mon Nov 07 12:23:20 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop