shopizer-uncached

diff --git a/pom.xml b/pom.xml
index 9e64e5a..67c335c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,20 @@
 			<groupId>org.elasticsearch</groupId>
 			<artifactId>elasticsearch</artifactId>
 			<version>${org.elasticsearch-version}</version>
-		</dependency>		
+		</dependency>	
+		
+		<!-- https://mvnrepository.com/artifact/javax.mail/javax.mail-api -->
+		<dependency>
+		    <groupId>javax.mail</groupId>
+		    <artifactId>javax.mail-api</artifactId>
+		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/javax.mail/mail -->
+		<dependency>
+		    <groupId>javax.mail</groupId>
+		    <artifactId>mail</artifactId>
+		    <version>1.4.7</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 40d15a6..4513947 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 Nov 24 13:46:23 EST 2016
+#Wed Nov 30 12:57:26 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 fc3b17c..52f2182 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 Nov 24 13:46:23 EST 2016
+#Wed Nov 30 12:57:26 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 1087f97..1f829da 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -125,21 +125,6 @@
 		    <groupId>org.freemarker</groupId>
 		    <artifactId>freemarker</artifactId>
 		</dependency>
-		
- 		<!-- https://mvnrepository.com/artifact/javax.mail/javax.mail-api -->
- 		<!--
-		<dependency>
-		    <groupId>javax.mail</groupId>
-		    <artifactId>javax.mail-api</artifactId>
-		</dependency> -->
-		
-		<!-- https://mvnrepository.com/artifact/javax.mail/mail -->
-		<dependency>
-		    <groupId>javax.mail</groupId>
-		    <artifactId>mail</artifactId>
-		    <version>1.4.7</version>
-		</dependency>
-		
 
 		<!-- https://mvnrepository.com/artifact/org.springframework/spring-context-support -->
 		<dependency>

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java
index bd8cea2..a498233 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/GroupRepository.java
@@ -17,10 +17,10 @@ public interface GroupRepository extends JpaRepository<Group, Integer> {
 	@Query("select distinct g from Group as g join fetch g.permissions perms order by g.id")
 	List<Group> findAll();
 	
-	@Query("select g from Group as g join fetch g.permissions perms where perms.id in (?1) ")
+	@Query("select distinct g from Group as g join fetch g.permissions perms where perms.id in (?1) ")
 	List<Group> findByPermissions(Set<Integer> permissionIds);
 	
-	@Query("select g from Group as g join fetch g.permissions perms where g.id in (?1) ")
+	@Query("select distinct g from Group as g join fetch g.permissions perms where g.id in (?1) ")
 	List<Group> findByIds(Set<Integer> groupIds);
 	
 	@Query("select distinct g from Group as g join fetch g.permissions perms where g.groupType = ?1")

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/UserRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/UserRepository.java
index e7ac971..528b078 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/UserRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/user/UserRepository.java
@@ -11,9 +11,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
 	@Query("select u from User as u inner join fetch u.groups ug inner join fetch u.merchantStore um left join fetch u.defaultLanguage ul where u.adminName = ?1")
 	User findByUserName(String userName);
-	
+
 	@Query("select u from User as u inner join fetch u.groups ug inner join fetch u.merchantStore um left join fetch u.defaultLanguage ul where u.id = ?1")
-	User findById(Long id);
+	User findOne(Long id);
 	
 	@Query("select u from User as u inner join fetch u.groups ug inner join fetch u.merchantStore um left join fetch u.defaultLanguage ul order by u.id")
 	List<User> findAll();

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 3e0f538..60f6216 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 Nov 24 13:46:24 EST 2016
+#Wed Nov 30 12:57:27 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index cbc6446..26b39a4 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -90,11 +90,6 @@
 			<artifactId>h2</artifactId>
 		</dependency>	
 
-		<dependency>
-		    <groupId>javax.validation</groupId>
-		    <artifactId>validation-api</artifactId>
-		    <version>1.1.0.Final</version>
-		</dependency>
 
 		<!-- Servlet -->
 		<dependency>
@@ -120,7 +115,14 @@
 			<version>1.2</version>
 		</dependency>
 		
-
+		<!-- https://mvnrepository.com/artifact/javax/javaee-api -->
+		<!--
+		<dependency>
+		    <groupId>javax</groupId>
+		    <artifactId>javaee-api</artifactId>
+		    <version>7.0</version>
+		</dependency>
+		-->
 		
 	</dependencies>
 	

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 8bbe5e7..102328d 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 62a4d10..c6631d2 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Tue Nov 29 15:37:04 EST 2016
-id=158b1ce139543c5cc9de5085c7e7583e8f054752c02
+#Wed Nov 30 12:39:41 EST 2016
+id=158b65207b600ca2c9bf8b0e1f0fafe93ddb775485b
 method=file

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
index 6064a00..3b63e80 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
@@ -25,7 +25,9 @@ import com.salesmanager.shop.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -39,6 +41,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
@@ -78,6 +81,7 @@ public class UserController {
 	private EmailUtils emailUtils;
 	
 	@Inject
+	@Named("passwordEncoder")
 	private PasswordEncoder passwordEncoder;
 	
 	private final static String QUESTION_1 = "question1";
@@ -140,9 +144,7 @@ public class UserController {
 						resp.addDataEntry(entry);
 					
 					}
-				
 				}
-
 			}
 
 			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
@@ -153,7 +155,6 @@ public class UserController {
 		}
 
 		String returnString = resp.toJSONString();
-
 		return new ResponseEntity<String>(returnString,HttpStatus.OK);
 	}
 
@@ -191,19 +192,14 @@ public class UserController {
 			result.addError(error);
 			return ControllerConstants.Tiles.User.password;
 		}
-		
 
-		String tempPass = passwordEncoder.encode(password.getPassword());
-		
-		//password match
-		if(!tempPass.equals(dbUser.getAdminPassword())) {
+		if(!passwordEncoder.matches(password.getPassword(), dbUser.getAdminPassword())) {
 			ObjectError error = new ObjectError("password",messages.getMessage("message.password.invalid", locale));
 			result.addError(error);
 			return ControllerConstants.Tiles.User.password;
 		}
-
-
 		
+
 		if(StringUtils.isBlank(password.getNewPassword())) {
 			ObjectError error = new ObjectError("newPassword",new StringBuilder().append(messages.getMessage("label.generic.newpassword", locale)).append(" ").append(messages.getMessage("message.cannot.empty", locale)).toString());
 			result.addError(error);
@@ -407,18 +403,22 @@ public class UserController {
 	}
 	
 	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/users/checkUserCode.html", method=RequestMethod.POST, produces="application/json")
-	public @ResponseBody String checkUserCode(HttpServletRequest request, HttpServletResponse response, Locale locale) {
+	@RequestMapping(value="/admin/users/checkUserCode.html", method=RequestMethod.POST)
+	public @ResponseBody ResponseEntity<String> checkUserCode(HttpServletRequest request, HttpServletResponse response, Locale locale) {
 		String code = request.getParameter("code");
 		String id = request.getParameter("id");
 
 		AjaxResponse resp = new AjaxResponse();
 		
+		final HttpHeaders httpHeaders= new HttpHeaders();
+	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		
 		try {
 			
 			if(StringUtils.isBlank(code)) {
 				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				return resp.toJSONString();
+				String returnString =  resp.toJSONString();
+				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 			}
 			
 			User user = userService.getByUserName(code);
@@ -430,11 +430,13 @@ public class UserController {
 					
 					if(user.getAdminName().equals(code) && user.getId()==lid) {
 						resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-						return resp.toJSONString();
+						String returnString =  resp.toJSONString();
+						return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 					}
 				} catch (Exception e) {
 					resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-					return resp.toJSONString();
+					String returnString =  resp.toJSONString();
+					return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 				}
 	
 			}
@@ -442,13 +444,16 @@ public class UserController {
 			
 			if(StringUtils.isBlank(code)) {
 				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				return resp.toJSONString();
+				String returnString =  resp.toJSONString();
+				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 			}
 
 			if(user!=null) {
 				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				return resp.toJSONString();
+				String returnString =  resp.toJSONString();
+				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 			}
+			
 
 			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
 
@@ -459,8 +464,8 @@ public class UserController {
 		}
 		
 		String returnString = resp.toJSONString();
-		
-		return returnString;
+		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
+
 	}
 	
 	@PreAuthorize("hasRole('AUTH')")

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
index 8d31f0d..90ba6ec 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
@@ -38,6 +38,8 @@ import java.util.List;
 public class UserServicesImpl implements WebUserServices{
 	
 	private static final Logger LOGGER = LoggerFactory.getLogger(UserServicesImpl.class);
+	
+	private static final String DEFAULT_INITIAL_PASSWORD = "password";
 
 	@Inject
 	private UserService userService;
@@ -117,7 +119,7 @@ public class UserServicesImpl implements WebUserServices{
 		
 		  MerchantStore store = merchantStoreService.getMerchantStore(MerchantStore.DEFAULT_STORE);
 
-		  String password = passwordEncoder.encode("password");
+		  String password = passwordEncoder.encode(DEFAULT_INITIAL_PASSWORD);
 		  
 		  List<Group> groups = groupService.listGroup(GroupType.ADMIN);
 		  

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
index 7731529..85a3e07 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
@@ -1,5 +1,13 @@
 package com.salesmanager.shop.init.data;
 
+import javax.annotation.PostConstruct;
+import javax.inject.Inject;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
 import com.salesmanager.core.business.constants.SystemConstants;
 import com.salesmanager.core.business.exception.ServiceException;
 import com.salesmanager.core.business.services.merchant.MerchantStoreService;
@@ -17,14 +25,6 @@ import com.salesmanager.core.model.user.GroupType;
 import com.salesmanager.core.model.user.Permission;
 import com.salesmanager.shop.admin.security.WebUserServices;
 import com.salesmanager.shop.constants.ApplicationConstants;
-import com.salesmanager.shop.utils.AppConfiguration;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
 
 
 
@@ -32,9 +32,7 @@ import javax.inject.Inject;
 public class InitializationLoader {
 	
 	private static final Logger LOGGER = LoggerFactory.getLogger(InitializationLoader.class);
-	
-	@Inject
-	private AppConfiguration appConfiguration;
+
 	
 	@Inject
 	private MerchantConfigurationService merchantConfigurationService;

diff --git a/sm-shop/src/main/resources/application.properties b/sm-shop/src/main/resources/application.properties
index b86329f..7ec0a9e 100644
--- a/sm-shop/src/main/resources/application.properties
+++ b/sm-shop/src/main/resources/application.properties
@@ -1,6 +1,7 @@
 logging.level.org.springframework.web: DEBUG
 logging.level.org.springframework.security: DEBUG
 
-#remove spring fav icon
-#spring.mvc.favicon.enabled=false
+#Default Spring white label error page
+server.error.whitelabel.enabled=false
+
 

diff --git a/sm-shop/src/main/resources/spring/shopizer-security.xml b/sm-shop/src/main/resources/spring/shopizer-security.xml
index ea62e33..318c8d4 100644
--- a/sm-shop/src/main/resources/spring/shopizer-security.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-security.xml
@@ -65,13 +65,6 @@
 		<intercept-url pattern="/admin/*/*.html*" access="hasRole('AUTH')" />
 		<intercept-url pattern="/admin/*/*/*.html*" access="hasRole('AUTH')" />
 
-		
-<!-- 		<form-login 
-			login-processing-url="/logonForm" 
-			login-page="/admin/logon.html"
-			authentication-success-handler-ref="userAuthenticationSuccessHandler"
-			authentication-failure-url="/admin/logon.html?login_error=true"
-			default-target-url="/admin/home.html" /> -->
 			
 		<form-login login-page="/admin/logon.html"
 					username-parameter="username" 

diff --git a/sm-shop/src/main/webapp/layout/admin/layout.jsp b/sm-shop/src/main/webapp/layout/admin/layout.jsp
index d6e1232..fc21d73 100644
--- a/sm-shop/src/main/webapp/layout/admin/layout.jsp
+++ b/sm-shop/src/main/webapp/layout/admin/layout.jsp
@@ -80,7 +80,7 @@ response.setDateHeader ("Expires", -1);
 										<li><a href="<c:url value="/admin/users/displayUser.html" />"><s:message code="label.my.profile" text="My profile" /></a></li>
 										<li class="divider"></li>
 										<li>
-											<c:url value="/admin/j_spring_security_logout" var="logoutUrl"/>
+											<c:url value="/admin/logout" var="logoutUrl"/>
 											<a href="${logoutUrl}"><s:message code="button.label.logout" text="Logout" /></a>
 										</li>
 									</ul>

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 2f49009..cea591b 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
-#Tue Nov 29 11:28:55 EST 2016
+#Wed Nov 30 12:57:29 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop