shopizer-developers

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java
index df64b57..9c095a5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/SecurityDataAccessException.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.security;
+package com.salesmanager.shop.admin.security;
 
 import org.springframework.dao.DataAccessException;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java
index 16863cd..6ebcac9 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserAuthenticationSuccessHandler.java
@@ -1,18 +1,16 @@
-package com.salesmanager.web.admin.security;
-
-import java.util.Date;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.admin.security;
 
+import com.salesmanager.core.business.services.user.UserService;
+import com.salesmanager.core.model.user.User;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 
-import com.salesmanager.core.business.user.model.User;
-import com.salesmanager.core.business.user.service.UserService;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 
 public class UserAuthenticationSuccessHandler extends
 		SavedRequestAwareAuthenticationSuccessHandler {

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 1567a42..1ee8242 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
@@ -1,30 +1,29 @@
-package com.salesmanager.web.admin.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
+package com.salesmanager.shop.admin.security;
+
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
+import com.salesmanager.core.business.services.user.GroupService;
+import com.salesmanager.core.business.services.user.PermissionService;
+import com.salesmanager.core.business.services.user.UserService;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.user.Group;
+import com.salesmanager.core.model.user.GroupType;
+import com.salesmanager.core.model.user.Permission;
+import com.salesmanager.shop.constants.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.GrantedAuthorityImpl;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.merchant.service.MerchantStoreService;
-import com.salesmanager.core.business.user.model.Group;
-import com.salesmanager.core.business.user.model.GroupType;
-import com.salesmanager.core.business.user.model.Permission;
-import com.salesmanager.core.business.user.service.GroupService;
-import com.salesmanager.core.business.user.service.PermissionService;
-import com.salesmanager.core.business.user.service.UserService;
-import com.salesmanager.web.constants.Constants;
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 
 /**
@@ -62,7 +61,7 @@ public class UserServicesImpl implements WebUserServices{
 	public UserDetails loadUserByUsername(String userName)
 			throws UsernameNotFoundException, DataAccessException {
 
-		com.salesmanager.core.business.user.model.User user = null;
+		com.salesmanager.core.model.user.User user = null;
 		Collection<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
 		
 		try {
@@ -73,7 +72,7 @@ public class UserServicesImpl implements WebUserServices{
 				return null;
 			}
 
-			GrantedAuthority role = new GrantedAuthorityImpl(Constants.PERMISSION_AUTHENTICATED);//required to login
+			GrantedAuthority role = new SimpleGrantedAuthority(Constants.PERMISSION_AUTHENTICATED);//required to login
 			authorities.add(role);
 	
 			List<Integer> groupsId = new ArrayList<Integer>();
@@ -89,7 +88,7 @@ public class UserServicesImpl implements WebUserServices{
 	    	
 	    	List<Permission> permissions = permissionService.getPermissions(groupsId);
 	    	for(Permission permission : permissions) {
-	    		GrantedAuthority auth = new GrantedAuthorityImpl(permission.getPermissionName());
+	    		GrantedAuthority auth = new SimpleGrantedAuthority(permission.getPermissionName());
 	    		authorities.add(auth);
 	    	}
     	
@@ -119,7 +118,7 @@ public class UserServicesImpl implements WebUserServices{
 		  List<Group> groups = groupService.listGroup(GroupType.ADMIN);
 		  
 		  //creation of the super admin admin:password)
-		  com.salesmanager.core.business.user.model.User user = new com.salesmanager.core.business.user.model.User("admin",password,"admin@shopizer.com");
+		  com.salesmanager.core.model.user.User user = new com.salesmanager.core.model.user.User("admin",password,"admin@shopizer.com");
 		  user.setFirstName("Administrator");
 		  user.setLastName("User");
 		  

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java
index 81f738f..47e4fd7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/WebUserServices.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.security;
+package com.salesmanager.shop.admin.security;
 
 import org.springframework.security.core.userdetails.UserDetailsService;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
index 58f8f74..e3f4851 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
@@ -1,25 +1,23 @@
-package com.salesmanager.web.files;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+package com.salesmanager.shop.controller;
 
+import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.content.OutputContentFile;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.store.controller.AbstractController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.content.model.OutputContentFile;
-import com.salesmanager.core.business.content.service.ContentService;
-import com.salesmanager.core.business.generic.exception.ServiceException;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.shop.controller.AbstractController;
+import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 @Controller
 public class FilesController extends AbstractController {
@@ -35,7 +33,6 @@ public class FilesController extends AbstractController {
 	/**
 	 * Serves static files (css, js ...) the repository is a single node by merchant
 	 * @param storeCode
-	 * @param imageName
 	 * @param extension
 	 * @return
 	 * @throws IOException

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
index aa77d15..a616cc1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.images;
+package com.salesmanager.shop.controller;
 
 import java.io.IOException;
 

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 e679b70..201840d 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
@@ -1,7 +1,7 @@
 /**
  *
  */
-package com.salesmanager.web.shop.controller;
+package com.salesmanager.shop.store.controller;
 
 import javax.servlet.http.HttpServletRequest;