Move UserBeanLocal to another package

code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/UserBeanLocal.java

@@ -25,6 +25,7 @@ import java.util.List;
 
 import javax.ejb.Local;
 
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Feedback;
 import fi.codecrew.moya.model.GameID;
@@ -37,7 +38,6 @@ import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.UserApproval;
 import fi.codecrew.moya.model.UserImage;
 import fi.codecrew.moya.util.MailMessage;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 

code/moya-beans-client/ejbModule/fi/codecrew/moya/util/UserSearchQuery.java → code/moya-beans-client/ejbModule/fi/codecrew/moya/entitysearch/UserSearchQuery.java

@@ -16,7 +16,7 @@
  * future versions of the Software. 
  * 
  */
-package fi.codecrew.moya.util;
+package fi.codecrew.moya.entitysearch;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java

@@ -48,6 +48,7 @@ import javax.imageio.ImageIO;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.apps.MapPermission;
 
 import org.apache.commons.codec.binary.Hex;
@@ -90,7 +91,6 @@ import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.UserApproval;
 import fi.codecrew.moya.model.UserImage;
 import fi.codecrew.moya.util.MailMessage;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.I18n;
 import fi.codecrew.moya.utilities.PasswordFunctions;
 import fi.codecrew.moya.utilities.SearchQuery;

code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventUserFacade.java

@@ -37,6 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import fi.codecrew.moya.beans.EventBeanLocal;
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.DatabaseHasCompare;
 import fi.codecrew.moya.enums.DatabaseValueCompare;
 import fi.codecrew.moya.facade.callbacks.EventLimiter;
@@ -52,7 +53,6 @@ import fi.codecrew.moya.model.EventUser_;
 import fi.codecrew.moya.model.LanEvent;
 import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.User_;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.jpa.FacadeCallback;

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java

@@ -32,12 +32,12 @@ import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.OrgRoleBeanLocal;
 import fi.codecrew.moya.beans.RoleBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.OrgRole;
 import fi.codecrew.moya.model.Role;
 import fi.codecrew.moya.model.User;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleView.java

@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory;
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.RoleBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.BortalApplication;
 import fi.codecrew.moya.enums.apps.IAppPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
@@ -41,7 +42,6 @@ import fi.codecrew.moya.model.ApplicationPermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Role;
 import fi.codecrew.moya.model.User;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.helpers.BortalApplicationWrapper;

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserSearchView.java

@@ -33,10 +33,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import fi.codecrew.moya.beans.UserBeanLocal;
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.User;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchQuery.QuerySortOrder;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.jpa.ModelInterface;

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/vip/VipView.java

@@ -16,12 +16,12 @@ import fi.codecrew.moya.beans.PermissionBeanLocal;
 import fi.codecrew.moya.beans.ProductBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.beans.VipBeanLocal;
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.apps.VipPermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Product;
 import fi.codecrew.moya.model.Vip;
 import fi.codecrew.moya.model.VipProduct;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 

code/moya-web/src/main/java/fi/codecrew/moya/web/flow/InfoView.java

@@ -19,13 +19,14 @@
 package fi.codecrew.moya.web.flow;
 
 import fi.codecrew.moya.beans.UserBeanLocal;
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.ReaderEvent;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.reader.ReaderView;
 import fi.codecrew.moya.web.cdiview.user.UserView;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +34,7 @@ import javax.ejb.EJB;
 import javax.enterprise.context.ConversationScoped;
 import javax.inject.Inject;
 import javax.inject.Named;
+
 import java.util.List;
 
 @Named

code/moya-web/src/main/java/fi/codecrew/moya/web/lecture/LectureReportsView.java

@@ -31,11 +31,11 @@ import javax.inject.Named;
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.beans.LectureBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
+import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.apps.LecturePermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Lecture;
 import fi.codecrew.moya.model.LectureGroup;
-import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.user.UserView;