Changed jre from 1.6 to 1.7 (and some other randoms..

code/MoyaAuthModule/.classpath

@@ -2,8 +2,12 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/MoyaAuthModuleClient"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/auth-libs"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OracleJDK 1.7u15">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

code/MoyaAuthModule/.settings/org.eclipse.jdt.core.prefs

-#Fri Jul 16 17:41:25 EEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaAuthModule/.settings/org.eclipse.wst.common.project.facet.core.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <runtime name="GlassFish 3.1.2"/>
-  <installed facet="java" version="1.6"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>

code/MoyaAuthModuleClient/.classpath

@@ -7,7 +7,7 @@
 			<attribute name="owner.project.facets" value="jst.utility"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OracleJDK 1.7u15">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

code/MoyaAuthModuleClient/.settings/org.eclipse.jdt.core.prefs

-#Wed Oct 27 01:24:28 EEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaAuthModuleClient/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -4,5 +4,5 @@
   <fixed facet="java"/>
   <fixed facet="jst.utility"/>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.6"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>

code/MoyaBeans/.classpath

@@ -7,6 +7,10 @@
 			<attribute name="owner.project.facets" value="jst.ejb"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

code/MoyaBeans/.settings/org.eclipse.jdt.core.prefs

-#Sat Dec 17 01:39:19 EET 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaBeans/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -3,7 +3,7 @@
   <runtime name="GlassFish 3.1.2"/>
   <fixed facet="java"/>
   <fixed facet="jst.ejb"/>
-  <installed facet="java" version="1.6"/>
   <installed facet="jst.ejb" version="3.1"/>
   <installed facet="sun.facet" version="9"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>

code/MoyaBeans/.settings/org.hibernate.eclipse.console.prefs

+default.configuration=
+eclipse.preferences.version=1
+hibernate3.enabled=false

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CheckoutFiBean.java

 package fi.codecrew.moya.beans;
 
 import java.io.IOException;
-import java.io.StringReader;
 import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -21,11 +19,13 @@ import javax.ejb.EJB;
 import javax.ejb.EJBException;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.DefaultHttpClient;
@@ -36,11 +36,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import com.sun.org.apache.xerces.internal.parsers.DOMParser;
-
 import fi.codecrew.moya.checkoutfi.CheckoutFiParam;
 import fi.codecrew.moya.clientutils.BortalLocalContextHolder;
 import fi.codecrew.moya.enums.apps.BillPermission;
@@ -168,8 +165,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
 		try {
 
 			final String calculatedHash = PasswordFunctions.calculateMd5(mdString.toString());
-			// logger.info("Calculated checksum {} from {}",
-			// mdString.toString(), calculatedHash);
+			logger.info("Calculated checksum {} from {}",
+					mdString.toString(), calculatedHash);
 
 			nameValuePairs.add(new BasicNameValuePair("MAC", calculatedHash));
 
@@ -188,12 +185,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
 
 			return parseTokenXml(xmlReturn);
 
-		} catch (UnsupportedEncodingException e) {
-			logger.warn("Error sending checkout.fi request", e);
-		} catch (ClientProtocolException e) {
-			logger.warn("Error sending query to checkout.fi", e);
 		} catch (IOException e) {
-			logger.warn("Error sending query to checkout.fi", e);
+			logger.warn("Error sending checkout.fi request", e);
 		}
 
 		return null;
@@ -229,9 +222,12 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
 	private static List<CheckoutBank> parseTokenXml(String xmlReturn) {
 		try {
 
-			DOMParser parser = new DOMParser();
-			parser.parse(new InputSource(new StringReader(xmlReturn)));
-			Document doc = parser.getDocument();
+			// DOMParser parser = new DOMParser();
+			// parser.parse(new InputSource(new StringReader(xmlReturn)));
+			DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+			DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+			Document doc = dBuilder.parse(xmlReturn);
+			// Document doc = parser.getDocument();
 			Element root = doc.getDocumentElement();
 			root.normalize();
 			// NodeList rootChildren = root.getChildNodes();
@@ -258,12 +254,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
 
 			}
 			return retbanks;
-		} catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+		} catch (SAXException | IOException | ParserConfigurationException e) {
+			logger.warn("Error parsing response from checkout response:" + xmlReturn, e);
 		}
 		return null;
 	}

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/FoodWaveBean.java

@@ -8,12 +8,10 @@ import javax.annotation.security.RolesAllowed;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+import fi.codecrew.moya.enums.apps.ShopPermission;
 import fi.codecrew.moya.facade.FoodWaveFacade;
 import fi.codecrew.moya.facade.FoodWaveTemplateFacade;
 import fi.codecrew.moya.facade.ProductFacade;
-import fi.codecrew.moya.beans.FoodWaveBeanLocal;
-import fi.codecrew.moya.enums.apps.ShopPermission;
 import fi.codecrew.moya.model.FoodWave;
 import fi.codecrew.moya.model.FoodWaveTemplate;
 import fi.codecrew.moya.model.Product;
@@ -59,7 +57,7 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 
 	@Override
 	public List<FoodWave> findShoppableFoodwaves() {
-		throw new NotImplementedException();
+		throw new java.lang.UnsupportedOperationException();
 	}
 
 	@Override
@@ -125,7 +123,7 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
 		product = productfacade.merge(product);
 		template.getProducts().remove(product);
 		product.getFoodWaveTemplates().remove(template);
-		
+
 		return template;
 	}
 

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java

@@ -175,7 +175,8 @@ public class PermissionBean implements PermissionBeanLocal {
 	public boolean isLoggedIn() {
 		Principal principal = context.getCallerPrincipal();
 		boolean ret = principal != null && !User.ANONYMOUS_LOGINNAME.equalsIgnoreCase(principal.getName());
-		logger.info("Checking principal {} against anon: {}", principal, ret);
+		// logger.info("Checking principal {} against anon: {}", principal,
+		// ret);
 		return ret;
 		// return !getAnonEventUser().equals(getCurrentUser()) ||
 		// getCurrentUser().getUser().isSuperadmin();

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/SitePageBean.java

@@ -14,11 +14,8 @@ import javax.ejb.Stateless;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.codecrew.moya.facade.SitePageFacade;
-import fi.codecrew.moya.beans.EventBeanLocal;
-import fi.codecrew.moya.beans.PermissionBeanLocal;
-import fi.codecrew.moya.beans.SitePageBeanLocal;
 import fi.codecrew.moya.enums.apps.ContentPermission;
+import fi.codecrew.moya.facade.SitePageFacade;
 import fi.codecrew.moya.model.PageContent;
 import fi.codecrew.moya.model.Role;
 import fi.codecrew.moya.model.SitePage;
@@ -122,6 +119,7 @@ public class SitePageBean implements SitePageBeanLocal {
 		{
 			for (Role r : page.getAllowedRoles()) {
 				if (roles.contains(r)) {
+					logger.debug("Has role for page {}, role {}", page, r);
 					ret = sitepagefacade.findContents(page, new Date());
 					break;
 				}

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

@@ -133,7 +133,7 @@ public class UserBean implements UserBeanLocal {
 
 		EventUser ret = eventUserFacade.merge(user);
 		ctbean.checkPrintedCard(ret);
-		currentEventuser = null;
+		// currentEventuser = null;
 		return ret;
 	}
 
@@ -150,13 +150,15 @@ public class UserBean implements UserBeanLocal {
 
 	}
 
-	private EventUser currentEventuser;
-	private ArrayList<Role> currentEventuserRoles;
+	// private EventUser currentEventuser;
+	// private ArrayList<Role> currentEventuserRoles;
 
 	public ArrayList<Role> localFindUsersRoles(EventUser u) {
-		if (currentEventuser != null && u.equals(currentEventuser)) {
-			return currentEventuserRoles;
-		}
+		// if (currentEventuser != null && u.equals(currentEventuser)) {
+		// logger.debug("Returnin cached eventuserroles for user {}: {}",
+		// currentEventuser, currentEventuserRoles);
+		// return currentEventuserRoles;
+		// }
 		Set<Role> checkedRoles = new HashSet<Role>();
 		if (u != null)
 		{
@@ -183,9 +185,12 @@ public class UserBean implements UserBeanLocal {
 				}
 			}
 		}
-		currentEventuser = u;
-		currentEventuserRoles = new ArrayList<Role>(checkedRoles);
-		return currentEventuserRoles;
+		// currentEventuser = u;
+		// currentEventuserRoles = new ArrayList<Role>(checkedRoles);
+		// logger.debug("Returning parsed eventUser roles for user {}:  {} ", u,
+		// currentEventuserRoles);
+		// return currentEventuserRoles;
+		return new ArrayList<Role>(checkedRoles);
 	}
 
 	private static void addRecursive(Set<Role> checkedRoles, Collection<Role> roles) {

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/VerkkomaksutFiBean.java

@@ -74,7 +74,7 @@ public class VerkkomaksutFiBean implements VerkkomaksutFiBeanLocal {
 		LanEventPrivateProperty expire = eventbean.getPrivateProperty(LanEventPrivatePropertyKey.VERKKOMAKSU_KEY_EXPIRE);
 		String merchantid = eventbean.getPrivatePropertyString(LanEventPrivatePropertyKey.VERKKOMAKSU_MERCHANT_ID);
 		String merchantPassword = eventbean.getPrivatePropertyString(LanEventPrivatePropertyKey.VERKKOMAKSU_MERCHANT_PASSWORD);
-		return !((expire != null && new Date().after(expire.getDateValue()))
+		return !((expire != null && expire.getDateValue() != null && new Date().after(expire.getDateValue()))
 				|| merchantid == null || merchantid.isEmpty()
 				|| merchantPassword == null || merchantPassword.isEmpty());
 	}

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/EventUserFacade.java

@@ -22,7 +22,6 @@ import fi.codecrew.moya.facade.callbacks.EventUserAccountSaldoPredicate;
 import fi.codecrew.moya.facade.callbacks.EventUserPlacegroupPredicate;
 import fi.codecrew.moya.facade.callbacks.EventUserRolefilter;
 import fi.codecrew.moya.facade.callbacks.EventUserSearchPredicate;
-import fi.codecrew.moya.facade.callbacks.FacadeCallback;
 import fi.codecrew.moya.facade.callbacks.OrderCallback;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.EventUser_;
@@ -31,6 +30,7 @@ import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.User_;
 import fi.codecrew.moya.util.UserSearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 
 /**
  * Session Bean implementation class EventUserFacade
@@ -71,10 +71,11 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
 	private EventUser checkCache(final String login, final LanEvent event) {
 		if (!logincache.containsKey(event.getId()))
 			logincache.put(event.getId(), new HashMap<String, Integer>());
+
 		Integer euId = null;
 		EventUser ret = null;
 		if ((euId = logincache.get(event.getId()).get(login)) != null) {
-			ret = find(euId);
+			ret = this.find(euId);
 		}
 		return ret;
 
@@ -101,8 +102,7 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<EventUser> cq = cb.createQuery(EventUser.class);
 		Root<EventUser> root = cq.from(EventUser.class);
-		cq.where(cb.equal(root.get(EventUser_.event),
-				eventBean.getCurrentEvent()));
+		cq.where(cb.equal(root.get(EventUser_.event), eventBean.getCurrentEvent()));
 		return getEm().createQuery(cq).getResultList();
 	}
 

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/FoodWaveFacade.java

 package fi.codecrew.moya.facade;
 
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -11,11 +10,10 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
 
-import fi.codecrew.moya.model.FoodWaveTemplate_;
-import fi.codecrew.moya.model.FoodWave_;
-import fi.codecrew.moya.model.OrgRole_;
 import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.model.FoodWave;
+import fi.codecrew.moya.model.FoodWaveTemplate_;
+import fi.codecrew.moya.model.FoodWave_;
 
 @Stateless
 @LocalBean
@@ -26,13 +24,13 @@ public class FoodWaveFacade extends IntegerPkGenericFacade<FoodWave> {
 	public FoodWaveFacade() {
 		super(FoodWave.class);
 	}
-	
+
 	public List<FoodWave> getEventFoodWaves() {
 
 		CriteriaBuilder cb = getEm().getCriteriaBuilder();
 		CriteriaQuery<FoodWave> cq = cb.createQuery(FoodWave.class);
 		Root<FoodWave> root = cq.from(FoodWave.class);
-		cq.where( cb.equal(root.get(FoodWave_.template).get(FoodWaveTemplate_.event), eventBean.getCurrentEvent()));
+		cq.where(cb.equal(root.get(FoodWave_.template).get(FoodWaveTemplate_.event), eventBean.getCurrentEvent()));
 
 		return getEm().createQuery(cq).getResultList();
 	}

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/IntegerPkGenericFacade.java

@@ -3,6 +3,7 @@ package fi.codecrew.moya.facade;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 
+import fi.codecrew.moya.utilities.jpa.GenericFacade;
 import fi.codecrew.moya.utilities.jpa.ModelInterface;
 
 /**

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/UserFacade.java

@@ -15,7 +15,6 @@ import javax.persistence.metamodel.SingularAttribute;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.codecrew.moya.facade.callbacks.FacadeCallback;
 import fi.codecrew.moya.facade.callbacks.OrderCallback;
 import fi.codecrew.moya.facade.callbacks.StringSearchPredicateCreator;
 import fi.codecrew.moya.model.User_;
@@ -23,6 +22,7 @@ import fi.codecrew.moya.beans.EventBeanLocal;
 import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.utilities.SearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 
 @Stateless
 @LocalBean

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/AndPredicateCreator.java

@@ -9,6 +9,7 @@ import javax.persistence.criteria.From;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.metamodel.SingularAttribute;
 
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 import fi.codecrew.moya.utilities.jpa.ModelInterface;
 
 public class AndPredicateCreator<A, T extends ModelInterface> implements FacadeCallback<T> {

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/EventLimiter.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.Predicate;
 import fi.codecrew.moya.model.EventUser_;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.LanEvent;
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 
 public class EventLimiter implements FacadeCallback<EventUser> {
 

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/EventUserAccountSaldoPredicate.java

@@ -14,6 +14,7 @@ import fi.codecrew.moya.model.AccountEvent_;
 import fi.codecrew.moya.enums.DatabaseValueCompare;
 import fi.codecrew.moya.model.AccountEvent;
 import fi.codecrew.moya.model.EventUser;
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 
 public class EventUserAccountSaldoPredicate implements FacadeCallback<EventUser> {
 	private final DatabaseValueCompare compare;

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/EventUserPlacegroupPredicate.java

@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;
 
 import fi.codecrew.moya.model.EventUser_;
 import fi.codecrew.moya.model.EventUser;
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 
 public class EventUserPlacegroupPredicate implements FacadeCallback<EventUser> {
 

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/EventUserRolefilter.java

@@ -25,6 +25,7 @@ import fi.codecrew.moya.model.Product_;
 import fi.codecrew.moya.model.Role_;
 import fi.codecrew.moya.model.EventUser;
 import fi.codecrew.moya.model.Role;
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 
 public class EventUserRolefilter implements FacadeCallback<EventUser> {
 

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/OrPredicateCreator.java

@@ -11,6 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 import fi.codecrew.moya.utilities.jpa.ModelInterface;
 
 public class OrPredicateCreator<A, T extends ModelInterface> implements FacadeCallback<T> {

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/OrderCallback.java

@@ -9,6 +9,7 @@ import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.metamodel.SingularAttribute;
 
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 import fi.codecrew.moya.utilities.jpa.ModelInterface;
 
 public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T> {

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/PathStringSearchPredicateCreator.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.metamodel.SingularAttribute;
 
+import fi.codecrew.moya.utilities.jpa.FacadeCallback;
 import fi.codecrew.moya.utilities.jpa.ModelInterface;
 
 public abstract class PathStringSearchPredicateCreator<T extends ModelInterface, D extends ModelInterface> implements FacadeCallback<T> {

code/MoyaBeansClient/.classpath

@@ -7,6 +7,10 @@
 			<attribute name="owner.project.facets" value="jst.utility"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

code/MoyaBeansClient/.settings/org.eclipse.jdt.core.prefs

-#Thu Oct 27 18:05:08 EEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaBeansClient/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -4,5 +4,5 @@
   <fixed facet="java"/>
   <fixed facet="jst.utility"/>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.6"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>

code/MoyaCardPrinter/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

code/MoyaCardPrinter/.settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaDatabase/.classpath

@@ -7,6 +7,10 @@
 			<attribute name="owner.project.facets" value="jst.utility"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

code/MoyaDatabase/.settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

code/MoyaDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -6,5 +6,5 @@
   <fixed facet="jpt.jpa"/>
   <installed facet="jst.utility" version="1.0"/>
   <installed facet="jpt.jpa" version="2.0"/>
-  <installed facet="jst.java" version="1.6"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>

code/MoyaTerminalWeb/.classpath

@@ -8,7 +8,7 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/OracleJDK 1.7u15">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

code/MoyaTerminalWeb/.settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaTerminalWeb/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -4,8 +4,8 @@
   <fixed facet="wst.jsdt.web"/>
   <fixed facet="jst.web"/>
   <fixed facet="java"/>
-  <installed facet="java" version="1.6"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="sun.facet" version="9"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>

code/MoyaUtilities/.classpath

@@ -7,6 +7,10 @@
 			<attribute name="owner.project.facets" value="jst.utility"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

code/MoyaUtilities/.settings/org.eclipse.jdt.core.prefs

-#Sat Jun 12 05:34:28 EEST 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaUtilities/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -3,6 +3,6 @@
   <runtime name="GlassFish 3.1.2"/>
   <fixed facet="jst.java"/>
   <fixed facet="jst.utility"/>
-  <installed facet="jst.java" version="6.0"/>
   <installed facet="jst.utility" version="1.0"/>
+  <installed facet="jst.java" version="1.7"/>
 </faceted-project>

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/FacadeCallback.java → code/MoyaUtilities/src/fi/codecrew/moya/utilities/jpa/FacadeCallback.java

-package fi.codecrew.moya.facade.callbacks;
+package fi.codecrew.moya.utilities.jpa;
 
 import java.util.List;
 
@@ -7,7 +7,6 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.From;
 import javax.persistence.criteria.Predicate;
 
-import fi.codecrew.moya.utilities.jpa.ModelInterface;
 
 public interface FacadeCallback<C extends ModelInterface> {
 

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/GenericFacade.java → code/MoyaUtilities/src/fi/codecrew/moya/utilities/jpa/GenericFacade.java

-package fi.codecrew.moya.facade;
+package fi.codecrew.moya.utilities.jpa;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -14,10 +14,8 @@ import javax.persistence.criteria.Path;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
-import fi.codecrew.moya.facade.callbacks.FacadeCallback;
 import fi.codecrew.moya.utilities.SearchQuery;
 import fi.codecrew.moya.utilities.SearchResult;
-import fi.codecrew.moya.utilities.jpa.ModelInterface;
 
 public abstract class GenericFacade<C extends ModelInterface> {
 

code/MoyaWeb/.classpath

@@ -8,6 +8,10 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

code/MoyaWeb/.settings/org.eclipse.jdt.core.prefs

 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7

code/MoyaWeb/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -4,8 +4,8 @@
   <fixed facet="jst.web"/>
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.6"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="sun.facet" version="9"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/FoodShopView.java

@@ -17,7 +17,7 @@ import fi.codecrew.moya.model.FoodWave;
 import fi.codecrew.moya.web.annotations.SelectedUser;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 
-@Named
+@Named()
 @ConversationScoped
 public class FoodShopView extends GenericCDIView {
 
@@ -26,7 +26,6 @@ public class FoodShopView extends GenericCDIView {
 
 	private static final long serialVersionUID = 1288114954999406683L;
 
-	
 	@Inject
 	@SelectedUser
 	private EventUser user;