Merge branch 'master' of codecrew.fi:codecrew/moya into devel

Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java

code/MoyaBeansClient/.gitignore

+/target

code/MoyaDatabase/.gitignore

+/target

code/MoyaWeb/src/fi/codecrew/moya/web/ErrorPageView.java

@@ -3,6 +3,7 @@ package fi.codecrew.moya.web;
 import java.io.PrintWriter;
 import java.io.PrintWriter;
 import java.io.Serializable;
 import java.io.Serializable;
 import java.io.StringWriter;
 import java.io.StringWriter;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.Map;
 import java.util.Map;
 import java.util.zip.CRC32;
 import java.util.zip.CRC32;
@@ -58,7 +59,7 @@ public class ErrorPageView implements Serializable {
 		Throwable ex =
 		Throwable ex =
 				(Throwable) requestMap.get("javax.servlet.error.exception");
 				(Throwable) requestMap.get("javax.servlet.error.exception");
 		CRC32 stackHash = new CRC32();
 		CRC32 stackHash = new CRC32();
-		stackHash.update(ex.getStackTrace().toString().getBytes());
+		stackHash.update(Arrays.toString(ex.getStackTrace()).getBytes());
 
 
 		return "0x" + Long.toHexString(stackHash.getValue());
 		return "0x" + Long.toHexString(stackHash.getValue());
 
 

code/MoyaWeb/src/fi/codecrew/moya/web/flow/IncomingView.java

 package fi.codecrew.moya.web.flow;
 package fi.codecrew.moya.web.flow;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.List;
 import java.util.List;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
@@ -21,11 +20,9 @@ import fi.codecrew.moya.beans.PlaceBeanLocal;
 import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
 import fi.codecrew.moya.beans.PlaceGroupBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.beans.UserBeanLocal;
 import fi.codecrew.moya.enums.CardState;
 import fi.codecrew.moya.enums.CardState;
-import fi.codecrew.moya.enums.apps.MapPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.GroupMembership;
 import fi.codecrew.moya.model.GroupMembership;
-import fi.codecrew.moya.model.PlaceGroup;
 import fi.codecrew.moya.model.PrintedCard;
 import fi.codecrew.moya.model.PrintedCard;
 import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.SearchResult;
@@ -77,8 +74,7 @@ public class IncomingView extends GenericCDIView {
 
 
 	private EventUser searchMulti = null;
 	private EventUser searchMulti = null;
 
 
-	
-	ListDataModel<GroupMembership> memberlist = null;
+	private ListDataModel<GroupMembership> memberlist = null;
 
 
 	public void initView() {
 	public void initView() {
 		super.beginConversation();
 		super.beginConversation();
@@ -229,16 +225,12 @@ public class IncomingView extends GenericCDIView {
 		this.searchMulti = searchMulti;
 		this.searchMulti = searchMulti;
 	}
 	}
 
 
-	
-
 	public ListDataModel<GroupMembership> getGroupMemberships() {
 	public ListDataModel<GroupMembership> getGroupMemberships() {
 		memberlist = new ListDataModel<GroupMembership>(
 		memberlist = new ListDataModel<GroupMembership>(
 				placegroupBean.getMembershipsAndCreations(userview.getUser()));
 				placegroupBean.getMembershipsAndCreations(userview.getUser()));
 		return memberlist;
 		return memberlist;
 	}
 	}
 
 
-	
-
 	public String givePlace() {
 	public String givePlace() {
 		GroupMembership row = memberlist.getRowData();
 		GroupMembership row = memberlist.getRowData();
 		if (row != null) {
 		if (row != null) {
@@ -257,6 +249,7 @@ public class IncomingView extends GenericCDIView {
 		return null;
 		return null;
 	}
 	}
 
 
+
 	public void changeReader() {
 	public void changeReader() {
 		namecontainer.setReaderId(null);
 		namecontainer.setReaderId(null);
 		super.navihandler.redirectNavigation("index.jsf");
 		super.navihandler.redirectNavigation("index.jsf");
@@ -265,5 +258,4 @@ public class IncomingView extends GenericCDIView {
 	
 	
 	
 	
 	
 	
-
 }
 }

code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java

 package fi.codecrew.moya.web.helper;
 package fi.codecrew.moya.web.helper;
 
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
+import java.io.Serializable;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
@@ -31,8 +32,12 @@ import fi.codecrew.moya.model.MenuNavigation;
 
 
 @Named
 @Named
 @RequestScoped
 @RequestScoped
-public class LayoutView {
+public class LayoutView implements Serializable {
 
 
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4468645109141859301L;
 	@Inject
 	@Inject
 	private FacesContext context;
 	private FacesContext context;
 	private ResourceBundle rb;
 	private ResourceBundle rb;

test.foo

+Jotain todella järkevää ja kivaa jota kaikki haluaa