shopizer-developers

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 0325b6e..1f1bbf3 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
new file mode 100644
index 0000000..aafaa8e
--- /dev/null
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -0,0 +1,4 @@
+#FileLock
+#Mon Nov 07 09:56:14 EST 2016
+id=1583f4a29a90beedf935274b79efdcaee5c3463649f
+method=file

diff --git a/sm-shop/SALESMANAGER.trace.db b/sm-shop/SALESMANAGER.trace.db
new file mode 100644
index 0000000..43bdace
--- /dev/null
+++ b/sm-shop/SALESMANAGER.trace.db
@@ -0,0 +1,3 @@
+2016-11-07 09:53:58 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLException: Value too long for column "ADMIN_PASSWORD VARCHAR(50) NOT NULL": "'$2a$11$/VXc.k8mrX71U7tqHwUSTeXO3.2tp0JMsyU1.u1Av96Pp/OZZpc2e' (60)"; SQL statement:
+insert into SALESMANAGER.USER (ACTIVE, ADMIN_EMAIL, ADMIN_NAME, ADMIN_PASSWORD, ADMIN_A1, ADMIN_A2, ADMIN_A3, DATE_CREATED, DATE_MODIFIED, UPDT_ID, LANGUAGE_ID, ADMIN_FIRST_NAME, LAST_ACCESS, ADMIN_LAST_NAME, LOGIN_ACCESS, MERCHANT_ID, ADMIN_Q1, ADMIN_Q2, ADMIN_Q3, USER_ID) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) [22001-191]

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java
index 66c638c..a4ab51b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java
@@ -9,6 +9,8 @@ import java.util.Set;
 import java.util.regex.Pattern;
 
 import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Qualifier;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -101,6 +103,7 @@ public class CustomerController {
 	private CustomerAttributeService customerAttributeService;
 	
 	@Inject
+	@Named("passwordEncoder")
 	private PasswordEncoder passwordEncoder;
 	
 	@Inject

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 a8a4118..f7409df 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
@@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -191,7 +191,7 @@ public class UserController {
 		}
 		
 
-		String tempPass = passwordEncoder.encodePassword(password.getPassword(), null);
+		String tempPass = passwordEncoder.encode(password.getPassword());
 		
 		//password match
 		if(!tempPass.equals(dbUser.getAdminPassword())) {
@@ -228,7 +228,7 @@ public class UserController {
 		
 		
 		
-		String pass = passwordEncoder.encodePassword(password.getNewPassword(), null);
+		String pass = passwordEncoder.encode(password.getNewPassword());
 		dbUser.setAdminPassword(pass);
 		userService.update(dbUser);
 		
@@ -571,7 +571,7 @@ public class UserController {
 		if(user.getId()!=null && user.getId()>0) {
 			user.setAdminPassword(dbUser.getAdminPassword());
 		} else {
-			String encoded = passwordEncoder.encodePassword(user.getAdminPassword(),null);
+			String encoded = passwordEncoder.encode(user.getAdminPassword());
 			user.setAdminPassword(encoded);
 		}
 		
@@ -799,7 +799,7 @@ public class UserController {
 					userLocale =  LocaleUtils.getLocale(userLanguage);
 					
 					String tempPass = userReset.generateRandomString();
-					String pass = passwordEncoder.encodePassword(tempPass, null);
+					String pass = passwordEncoder.encode(tempPass);
 					
 					dbUser.setAdminPassword(pass);
 					userService.update(dbUser);

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 e70adb5..62b9b09 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
@@ -21,6 +21,8 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
+import javax.inject.Named;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -45,6 +47,7 @@ public class UserServicesImpl implements WebUserServices{
 	private MerchantStoreService merchantStoreService;
 	
 	@Inject
+	@Named("passwordEncoder")
 	private PasswordEncoder passwordEncoder;
 	
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
index 5aa96ee..76e50c0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitStoreData.java
@@ -59,7 +59,7 @@ import com.salesmanager.shop.utils.LocaleUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
 import javax.inject.Inject;
@@ -789,7 +789,7 @@ public class InitStoreData implements InitData {
 			customer.setDefaultLanguage(en);
 			customer.setNick("shopizer");
 			
-			String password = passwordEncoder.encodePassword("password", null);
+			String password = passwordEncoder.encode("password");
 			customer.setPassword(password);
 			
 			List<Group> groups = groupService.listGroup(GroupType.CUSTOMER);

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
index 9bbb02c..96eca6f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
@@ -35,9 +35,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -240,7 +240,7 @@ public class CustomerAccountController extends AbstractController {
     	}
     	
     	String currentPassword = password.getCurrentPassword();
-    	String encodedCurrentPassword = passwordEncoder.encodePassword(currentPassword, null);
+    	String encodedCurrentPassword = passwordEncoder.encode(currentPassword);
     	
     	if(!StringUtils.equals(encodedCurrentPassword, customer.getPassword())) {
 			FieldError error = new FieldError("password","password",messages.getMessage("message.invalidpassword", locale));
@@ -260,7 +260,7 @@ public class CustomerAccountController extends AbstractController {
 		model.addAttribute("password", customerPassword);
 		
 		String newPassword = password.getPassword();
-		String encodedPassword = passwordEncoder.encodePassword(newPassword, null);
+		String encodedPassword = passwordEncoder.encode(newPassword);
 		
 		customer.setPassword(encodedPassword);
 		

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java
index fb014cb..d5127f0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerRegistrationController.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
index ac204ed..cd3801d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/facade/CustomerFacadeImpl.java
@@ -41,11 +41,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -318,7 +318,7 @@ public class CustomerFacadeImpl implements CustomerFacade
             }
 			//set groups
             if(!StringUtils.isBlank(customerModel.getPassword()) && !StringUtils.isBlank(customerModel.getNick())) {
-            	customerModel.setPassword(passwordEncoder.encodePassword(customer.getClearPassword(), null));
+            	customerModel.setPassword(passwordEncoder.encode(customer.getClearPassword()));
             	setCustomerModelDefaultProperties(customerModel, merchantStore);
             }
             
@@ -364,7 +364,7 @@ public class CustomerFacadeImpl implements CustomerFacade
 			}
 			if(StringUtils.isBlank(customer.getPassword())) {
 	        	String password = UserReset.generateRandomString();
-	        	String encodedPassword = passwordEncoder.encodePassword(password, null);
+	        	String encodedPassword = passwordEncoder.encode(password);
 	        	customer.setPassword(encodedPassword);
 			}
 		}

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java
index 7bd194e..734c05e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java
@@ -57,9 +57,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -486,7 +486,7 @@ public class ShoppingOrderController extends AbstractController {
 	        //if the customer is new, generate a password
 	        if(customer.getId()==null || customer.getId()==0) {//new customer
 	        	password = UserReset.generateRandomString();
-	        	String encodedPassword = passwordEncoder.encodePassword(password, null);
+	        	String encodedPassword = passwordEncoder.encode(password);
 	        	customer.setEncodedPassword(encodedPassword);
 	        }
 	        

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/services/customer/CustomerRESTController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/services/customer/CustomerRESTController.java
index f7237b0..46ff491 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/services/customer/CustomerRESTController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/services/customer/CustomerRESTController.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
@@ -368,7 +368,7 @@ public class CustomerRESTController {
 		}
 
 		@SuppressWarnings("deprecation")
-		String encodedPassword = passwordEncoder.encodePassword(password, null);
+		String encodedPassword = passwordEncoder.encode(password);
 		if(!StringUtils.isBlank(customer.getEncodedPassword())) {
 			encodedPassword = customer.getEncodedPassword();
 			customer.setClearPassword("");

diff --git a/sm-shop/src/main/resources/spring/shopizer-controllers.xml b/sm-shop/src/main/resources/spring/shopizer-controllers.xml
index f970fc9..c2af565 100644
--- a/sm-shop/src/main/resources/spring/shopizer-controllers.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-controllers.xml
@@ -57,19 +57,19 @@
 		
 		 <mvc:interceptor>
   			<mvc:mapping path="/shop/**"/>
-  			<bean class="com.salesmanager.web.filter.StoreFilter"/>
+  			<bean class="com.salesmanager.shop.filter.StoreFilter"/>
  		</mvc:interceptor>
  		
  		
  		<mvc:interceptor>
   			<mvc:mapping path="/customer/**"/>
-  			<bean class="com.salesmanager.web.filter.StoreFilter"/>
+  			<bean class="com.salesmanager.shop.filter.StoreFilter"/>
  		</mvc:interceptor>
 		
 		
  		<mvc:interceptor>
   			<mvc:mapping path="/admin/**"/>
-  			<bean class="com.salesmanager.web.filter.AdminFilter" />
+  			<bean class="com.salesmanager.shop.filter.AdminFilter" />
  		</mvc:interceptor>
 	</mvc:interceptors>