Merge branch 'master' into barcodefuckup

code/MoyaDatabase/src/fi/codecrew/moya/model/EventUser.java

@@ -177,6 +177,14 @@ public class EventUser extends GenericEntity {
         this.notes = notes;
     }
 
+    /**
+     * NOTICE: This returns only manually added roles. If you want to get all
+     * roles from products, places, etc, use
+     * {@link fi.codecrew.moya.beans.UserBeanLocal#findUsersRoles(EventUser)
+     * UserBeanLocal#findUsersRoles(EventUser) }
+     * 
+     * @return
+     */
     public List<Role> getRoles() {
         return roles;
     }

code/MoyaUtilities/src/main/java/fi/codecrew/moya/utilities/SearchQuery.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 public class SearchQuery implements Serializable {
 
-	public enum QuerySortOrder {
+	public static enum QuerySortOrder {
 		UNSORTED, ASCENDING, DESCENDING
 	}
 

code/MoyaWeb/src/fi/codecrew/moya/rest/RestApplicationEntrypoint.java

@@ -3,7 +3,9 @@ package fi.codecrew.moya.rest;
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
 
-@ApplicationPath("/rest")
+@ApplicationPath(RestApplicationEntrypoint.REST_PATH)
 public class RestApplicationEntrypoint extends Application {
 
+	public static final String REST_PATH = "/rest";
+
 }