Skip to content

Linnea Samila / Moya

Go to a project
Commit 0b5618f1 by Tuomas Riihimäki
Options

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

1 parent c8e39a5c
Inline Side-by-side
Showing with 132 additions and 110 deletions
code/MoyaAuthModule/.classpath
...@@ -2,8 +2,12 @@ ...@@ -2,8 +2,12 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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.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 combineaccessrules="false" kind="src" path="/MoyaAuthModuleClient"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/auth-libs"/> <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"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
code/MoyaAuthModule/.settings/org.eclipse.jdt.core.prefs
#Fri Jul 16 17:41:25 EEST 2010
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.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.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 3.1.2"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaAuthModuleClient/.classpath
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </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> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/MoyaAuthModuleClient/.settings/org.eclipse.jdt.core.prefs
#Wed Oct 27 01:24:28 EEST 2010
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.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.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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 @@ ...@@ -4,5 +4,5 @@
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaBeans/.classpath
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
<attribute name="owner.project.facets" value="jst.ejb"/> <attribute name="owner.project.facets" value="jst.ejb"/>
</attributes> </attributes>
</classpathentry> </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"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaBeans/.settings/org.eclipse.jdt.core.prefs
#Sat Dec 17 01:39:19 EET 2011
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.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.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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 @@ ...@@ -3,7 +3,7 @@
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.ejb"/> <fixed facet="jst.ejb"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.ejb" version="3.1"/> <installed facet="jst.ejb" version="3.1"/>
<installed facet="sun.facet" version="9"/> <installed facet="sun.facet" version="9"/>
<installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaBeans/.settings/org.hibernate.eclipse.console.prefs 0 → 100644
default.configuration=
eclipse.preferences.version=1
hibernate3.enabled=false
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/CheckoutFiBean.java
package fi.codecrew.moya.beans; package fi.codecrew.moya.beans;
import java.io.IOException; import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter; import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -21,11 +19,13 @@ import javax.ejb.EJB; ...@@ -21,11 +19,13 @@ import javax.ejb.EJB;
import javax.ejb.EJBException; import javax.ejb.EJBException;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; 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.commons.io.IOUtils;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair; import org.apache.http.NameValuePair;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost; import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.DefaultHttpClient;
...@@ -36,11 +36,8 @@ import org.w3c.dom.Document; ...@@ -36,11 +36,8 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element; import org.w3c.dom.Element;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.sun.org.apache.xerces.internal.parsers.DOMParser;
import fi.codecrew.moya.checkoutfi.CheckoutFiParam; import fi.codecrew.moya.checkoutfi.CheckoutFiParam;
import fi.codecrew.moya.clientutils.BortalLocalContextHolder; import fi.codecrew.moya.clientutils.BortalLocalContextHolder;
import fi.codecrew.moya.enums.apps.BillPermission; import fi.codecrew.moya.enums.apps.BillPermission;
...@@ -168,8 +165,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -168,8 +165,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
try { try {
final String calculatedHash = PasswordFunctions.calculateMd5(mdString.toString()); final String calculatedHash = PasswordFunctions.calculateMd5(mdString.toString());
// logger.info("Calculated checksum {} from {}", logger.info("Calculated checksum {} from {}",
// mdString.toString(), calculatedHash); mdString.toString(), calculatedHash);
nameValuePairs.add(new BasicNameValuePair("MAC", calculatedHash)); nameValuePairs.add(new BasicNameValuePair("MAC", calculatedHash));
...@@ -188,12 +185,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -188,12 +185,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
return parseTokenXml(xmlReturn); 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) { } catch (IOException e) {
logger.warn("Error sending query to checkout.fi", e); logger.warn("Error sending checkout.fi request", e);
} }
return null; return null;
...@@ -229,9 +222,12 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -229,9 +222,12 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
private static List<CheckoutBank> parseTokenXml(String xmlReturn) { private static List<CheckoutBank> parseTokenXml(String xmlReturn) {
try { try {
DOMParser parser = new DOMParser(); // DOMParser parser = new DOMParser();
parser.parse(new InputSource(new StringReader(xmlReturn))); // parser.parse(new InputSource(new StringReader(xmlReturn)));
Document doc = parser.getDocument(); DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
Document doc = dBuilder.parse(xmlReturn);
// Document doc = parser.getDocument();
Element root = doc.getDocumentElement(); Element root = doc.getDocumentElement();
root.normalize(); root.normalize();
// NodeList rootChildren = root.getChildNodes(); // NodeList rootChildren = root.getChildNodes();
...@@ -258,12 +254,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal { ...@@ -258,12 +254,8 @@ public class CheckoutFiBean implements CheckoutFiBeanLocal {
} }
return retbanks; return retbanks;
} catch (SAXException e) { } catch (SAXException | IOException | ParserConfigurationException e) {
// TODO Auto-generated catch block logger.warn("Error parsing response from checkout response:" + xmlReturn, e);
e.printStackTrace();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} }
return null; return null;
} }
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/FoodWaveBean.java
...@@ -8,12 +8,10 @@ import javax.annotation.security.RolesAllowed; ...@@ -8,12 +8,10 @@ import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.ejb.Stateless; 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.FoodWaveFacade;
import fi.codecrew.moya.facade.FoodWaveTemplateFacade; import fi.codecrew.moya.facade.FoodWaveTemplateFacade;
import fi.codecrew.moya.facade.ProductFacade; 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.FoodWave;
import fi.codecrew.moya.model.FoodWaveTemplate; import fi.codecrew.moya.model.FoodWaveTemplate;
import fi.codecrew.moya.model.Product; import fi.codecrew.moya.model.Product;
...@@ -59,7 +57,7 @@ public class FoodWaveBean implements FoodWaveBeanLocal { ...@@ -59,7 +57,7 @@ public class FoodWaveBean implements FoodWaveBeanLocal {
@Override @Override
public List<FoodWave> findShoppableFoodwaves() { public List<FoodWave> findShoppableFoodwaves() {
throw new NotImplementedException(); throw new java.lang.UnsupportedOperationException();
} }
@Override @Override
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java
...@@ -175,7 +175,8 @@ public class PermissionBean implements PermissionBeanLocal { ...@@ -175,7 +175,8 @@ public class PermissionBean implements PermissionBeanLocal {
public boolean isLoggedIn() { public boolean isLoggedIn() {
Principal principal = context.getCallerPrincipal(); Principal principal = context.getCallerPrincipal();
boolean ret = principal != null && !User.ANONYMOUS_LOGINNAME.equalsIgnoreCase(principal.getName()); 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 ret;
// return !getAnonEventUser().equals(getCurrentUser()) || // return !getAnonEventUser().equals(getCurrentUser()) ||
// getCurrentUser().getUser().isSuperadmin(); // getCurrentUser().getUser().isSuperadmin();
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/SitePageBean.java
...@@ -14,11 +14,8 @@ import javax.ejb.Stateless; ...@@ -14,11 +14,8 @@ import javax.ejb.Stateless;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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.enums.apps.ContentPermission;
import fi.codecrew.moya.facade.SitePageFacade;
import fi.codecrew.moya.model.PageContent; import fi.codecrew.moya.model.PageContent;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.SitePage; import fi.codecrew.moya.model.SitePage;
...@@ -122,6 +119,7 @@ public class SitePageBean implements SitePageBeanLocal { ...@@ -122,6 +119,7 @@ public class SitePageBean implements SitePageBeanLocal {
{ {
for (Role r : page.getAllowedRoles()) { for (Role r : page.getAllowedRoles()) {
if (roles.contains(r)) { if (roles.contains(r)) {
logger.debug("Has role for page {}, role {}", page, r);
ret = sitepagefacade.findContents(page, new Date()); ret = sitepagefacade.findContents(page, new Date());
break; break;
} }
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/UserBean.java
...@@ -133,7 +133,7 @@ public class UserBean implements UserBeanLocal { ...@@ -133,7 +133,7 @@ public class UserBean implements UserBeanLocal {
EventUser ret = eventUserFacade.merge(user); EventUser ret = eventUserFacade.merge(user);
ctbean.checkPrintedCard(ret); ctbean.checkPrintedCard(ret);
currentEventuser = null; // currentEventuser = null;
return ret; return ret;
} }
...@@ -150,13 +150,15 @@ public class UserBean implements UserBeanLocal { ...@@ -150,13 +150,15 @@ public class UserBean implements UserBeanLocal {
} }
private EventUser currentEventuser; // private EventUser currentEventuser;
private ArrayList<Role> currentEventuserRoles; // private ArrayList<Role> currentEventuserRoles;
public ArrayList<Role> localFindUsersRoles(EventUser u) { public ArrayList<Role> localFindUsersRoles(EventUser u) {
if (currentEventuser != null && u.equals(currentEventuser)) { // if (currentEventuser != null && u.equals(currentEventuser)) {
return currentEventuserRoles; // logger.debug("Returnin cached eventuserroles for user {}: {}",
} // currentEventuser, currentEventuserRoles);
// return currentEventuserRoles;
// }
Set<Role> checkedRoles = new HashSet<Role>(); Set<Role> checkedRoles = new HashSet<Role>();
if (u != null) if (u != null)
{ {
...@@ -183,9 +185,12 @@ public class UserBean implements UserBeanLocal { ...@@ -183,9 +185,12 @@ public class UserBean implements UserBeanLocal {
} }
} }
} }
currentEventuser = u; // currentEventuser = u;
currentEventuserRoles = new ArrayList<Role>(checkedRoles); // currentEventuserRoles = new ArrayList<Role>(checkedRoles);
return currentEventuserRoles; // 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) { 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 { ...@@ -74,7 +74,7 @@ public class VerkkomaksutFiBean implements VerkkomaksutFiBeanLocal {
LanEventPrivateProperty expire = eventbean.getPrivateProperty(LanEventPrivatePropertyKey.VERKKOMAKSU_KEY_EXPIRE); LanEventPrivateProperty expire = eventbean.getPrivateProperty(LanEventPrivatePropertyKey.VERKKOMAKSU_KEY_EXPIRE);
String merchantid = eventbean.getPrivatePropertyString(LanEventPrivatePropertyKey.VERKKOMAKSU_MERCHANT_ID); String merchantid = eventbean.getPrivatePropertyString(LanEventPrivatePropertyKey.VERKKOMAKSU_MERCHANT_ID);
String merchantPassword = eventbean.getPrivatePropertyString(LanEventPrivatePropertyKey.VERKKOMAKSU_MERCHANT_PASSWORD); 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() || merchantid == null || merchantid.isEmpty()
|| merchantPassword == null || merchantPassword.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; ...@@ -22,7 +22,6 @@ import fi.codecrew.moya.facade.callbacks.EventUserAccountSaldoPredicate;
import fi.codecrew.moya.facade.callbacks.EventUserPlacegroupPredicate; import fi.codecrew.moya.facade.callbacks.EventUserPlacegroupPredicate;
import fi.codecrew.moya.facade.callbacks.EventUserRolefilter; import fi.codecrew.moya.facade.callbacks.EventUserRolefilter;
import fi.codecrew.moya.facade.callbacks.EventUserSearchPredicate; 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.facade.callbacks.OrderCallback;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.EventUser_; import fi.codecrew.moya.model.EventUser_;
...@@ -31,6 +30,7 @@ import fi.codecrew.moya.model.User; ...@@ -31,6 +30,7 @@ import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.User_; import fi.codecrew.moya.model.User_;
import fi.codecrew.moya.util.UserSearchQuery; import fi.codecrew.moya.util.UserSearchQuery;
import fi.codecrew.moya.utilities.SearchResult; import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
/** /**
* Session Bean implementation class EventUserFacade * Session Bean implementation class EventUserFacade
...@@ -71,10 +71,11 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> { ...@@ -71,10 +71,11 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
private EventUser checkCache(final String login, final LanEvent event) { private EventUser checkCache(final String login, final LanEvent event) {
if (!logincache.containsKey(event.getId())) if (!logincache.containsKey(event.getId()))
logincache.put(event.getId(), new HashMap<String, Integer>()); logincache.put(event.getId(), new HashMap<String, Integer>());
Integer euId = null; Integer euId = null;
EventUser ret = null; EventUser ret = null;
if ((euId = logincache.get(event.getId()).get(login)) != null) { if ((euId = logincache.get(event.getId()).get(login)) != null) {
ret = find(euId); ret = this.find(euId);
} }
return ret; return ret;
...@@ -101,8 +102,7 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> { ...@@ -101,8 +102,7 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<EventUser> cq = cb.createQuery(EventUser.class); CriteriaQuery<EventUser> cq = cb.createQuery(EventUser.class);
Root<EventUser> root = cq.from(EventUser.class); Root<EventUser> root = cq.from(EventUser.class);
cq.where(cb.equal(root.get(EventUser_.event), cq.where(cb.equal(root.get(EventUser_.event), eventBean.getCurrentEvent()));
eventBean.getCurrentEvent()));
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/FoodWaveFacade.java
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -11,11 +10,10 @@ import javax.persistence.criteria.CriteriaBuilder; ...@@ -11,11 +10,10 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root; 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.beans.EventBeanLocal;
import fi.codecrew.moya.model.FoodWave; import fi.codecrew.moya.model.FoodWave;
import fi.codecrew.moya.model.FoodWaveTemplate_;
import fi.codecrew.moya.model.FoodWave_;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -32,7 +30,7 @@ public class FoodWaveFacade extends IntegerPkGenericFacade<FoodWave> { ...@@ -32,7 +30,7 @@ public class FoodWaveFacade extends IntegerPkGenericFacade<FoodWave> {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<FoodWave> cq = cb.createQuery(FoodWave.class); CriteriaQuery<FoodWave> cq = cb.createQuery(FoodWave.class);
Root<FoodWave> root = cq.from(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(); return getEm().createQuery(cq).getResultList();
} }
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/IntegerPkGenericFacade.java
...@@ -3,6 +3,7 @@ package fi.codecrew.moya.facade; ...@@ -3,6 +3,7 @@ package fi.codecrew.moya.facade;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext; import javax.persistence.PersistenceContext;
import fi.codecrew.moya.utilities.jpa.GenericFacade;
import fi.codecrew.moya.utilities.jpa.ModelInterface; 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; ...@@ -15,7 +15,6 @@ import javax.persistence.metamodel.SingularAttribute;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.facade.callbacks.FacadeCallback;
import fi.codecrew.moya.facade.callbacks.OrderCallback; import fi.codecrew.moya.facade.callbacks.OrderCallback;
import fi.codecrew.moya.facade.callbacks.StringSearchPredicateCreator; import fi.codecrew.moya.facade.callbacks.StringSearchPredicateCreator;
import fi.codecrew.moya.model.User_; import fi.codecrew.moya.model.User_;
...@@ -23,6 +22,7 @@ import fi.codecrew.moya.beans.EventBeanLocal; ...@@ -23,6 +22,7 @@ import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.model.User; import fi.codecrew.moya.model.User;
import fi.codecrew.moya.utilities.SearchQuery; import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult; import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
@Stateless @Stateless
@LocalBean @LocalBean
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/AndPredicateCreator.java
...@@ -9,6 +9,7 @@ import javax.persistence.criteria.From; ...@@ -9,6 +9,7 @@ import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.SingularAttribute;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
import fi.codecrew.moya.utilities.jpa.ModelInterface; import fi.codecrew.moya.utilities.jpa.ModelInterface;
public class AndPredicateCreator<A, T extends ModelInterface> implements FacadeCallback<T> { 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; ...@@ -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.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
public class EventLimiter implements FacadeCallback<EventUser> { 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_; ...@@ -14,6 +14,7 @@ import fi.codecrew.moya.model.AccountEvent_;
import fi.codecrew.moya.enums.DatabaseValueCompare; import fi.codecrew.moya.enums.DatabaseValueCompare;
import fi.codecrew.moya.model.AccountEvent; import fi.codecrew.moya.model.AccountEvent;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
public class EventUserAccountSaldoPredicate implements FacadeCallback<EventUser> { public class EventUserAccountSaldoPredicate implements FacadeCallback<EventUser> {
private final DatabaseValueCompare compare; private final DatabaseValueCompare compare;
......
code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/callbacks/EventUserPlacegroupPredicate.java
...@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate; ...@@ -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.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
public class EventUserPlacegroupPredicate implements FacadeCallback<EventUser> { 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_; ...@@ -25,6 +25,7 @@ import fi.codecrew.moya.model.Product_;
import fi.codecrew.moya.model.Role_; import fi.codecrew.moya.model.Role_;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Role; import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
public class EventUserRolefilter implements FacadeCallback<EventUser> { 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; ...@@ -11,6 +11,7 @@ import javax.persistence.metamodel.SingularAttribute;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
import fi.codecrew.moya.utilities.jpa.ModelInterface; import fi.codecrew.moya.utilities.jpa.ModelInterface;
public class OrPredicateCreator<A, T extends ModelInterface> implements FacadeCallback<T> { 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; ...@@ -9,6 +9,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.SingularAttribute;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
import fi.codecrew.moya.utilities.jpa.ModelInterface; import fi.codecrew.moya.utilities.jpa.ModelInterface;
public class OrderCallback<T extends ModelInterface> implements FacadeCallback<T> { 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; ...@@ -10,6 +10,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.metamodel.SingularAttribute; import javax.persistence.metamodel.SingularAttribute;
import fi.codecrew.moya.utilities.jpa.FacadeCallback;
import fi.codecrew.moya.utilities.jpa.ModelInterface; import fi.codecrew.moya.utilities.jpa.ModelInterface;
public abstract class PathStringSearchPredicateCreator<T extends ModelInterface, D extends ModelInterface> implements FacadeCallback<T> { public abstract class PathStringSearchPredicateCreator<T extends ModelInterface, D extends ModelInterface> implements FacadeCallback<T> {
......
code/MoyaBeansClient/.classpath
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </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"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaBeansClient/.settings/org.eclipse.jdt.core.prefs
#Thu Oct 27 18:05:08 EEST 2011
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.compliance=1.6 org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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 @@ ...@@ -4,5 +4,5 @@
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaCardPrinter/.classpath
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <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"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
code/MoyaCardPrinter/.settings/org.eclipse.jdt.core.prefs
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.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.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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 @@ ...@@ -7,6 +7,10 @@
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </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"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaDatabase/.settings/org.eclipse.jdt.core.prefs
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.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.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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.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_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 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 @@ ...@@ -6,5 +6,5 @@
<fixed facet="jpt.jpa"/> <fixed facet="jpt.jpa"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
<installed facet="jpt.jpa" version="2.0"/> <installed facet="jpt.jpa" version="2.0"/>
<installed facet="jst.java" version="1.6"/> <installed facet="jst.java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaTerminalWeb/.classpath
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<attribute name="owner.project.facets" value="jst.web"/> <attribute name="owner.project.facets" value="jst.web"/>
</attributes> </attributes>
</classpathentry> </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> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/MoyaTerminalWeb/.settings/org.eclipse.jdt.core.prefs
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.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.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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 @@ ...@@ -4,8 +4,8 @@
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<fixed facet="jst.web"/> <fixed facet="jst.web"/>
<fixed facet="java"/> <fixed facet="java"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.web" version="3.0"/> <installed facet="jst.web" version="3.0"/>
<installed facet="sun.facet" version="9"/> <installed facet="sun.facet" version="9"/>
<installed facet="wst.jsdt.web" version="1.0"/> <installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaUtilities/.classpath
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </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"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaUtilities/.settings/org.eclipse.jdt.core.prefs
#Sat Jun 12 05:34:28 EEST 2010
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.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.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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 @@ ...@@ -3,6 +3,6 @@
<runtime name="GlassFish 3.1.2"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.java" version="6.0"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
<installed facet="jst.java" version="1.7"/>
</faceted-project> </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; import java.util.List;
...@@ -7,7 +7,6 @@ import javax.persistence.criteria.CriteriaQuery; ...@@ -7,7 +7,6 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.From; import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import fi.codecrew.moya.utilities.jpa.ModelInterface;
public interface FacadeCallback<C extends 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.ArrayList;
import java.util.Collections; import java.util.Collections;
...@@ -14,10 +14,8 @@ import javax.persistence.criteria.Path; ...@@ -14,10 +14,8 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate; import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root; import javax.persistence.criteria.Root;
import fi.codecrew.moya.facade.callbacks.FacadeCallback;
import fi.codecrew.moya.utilities.SearchQuery; import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult; import fi.codecrew.moya.utilities.SearchResult;
import fi.codecrew.moya.utilities.jpa.ModelInterface;
public abstract class GenericFacade<C extends ModelInterface> { public abstract class GenericFacade<C extends ModelInterface> {
......
code/MoyaWeb/.classpath
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <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.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"/> <classpathentry kind="output" path="build/classes"/>
</classpath> </classpath>
code/MoyaWeb/.settings/org.eclipse.jdt.core.prefs
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled 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.compliance=1.6 org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=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 @@ ...@@ -4,8 +4,8 @@
<fixed facet="jst.web"/> <fixed facet="jst.web"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.web" version="3.0"/> <installed facet="jst.web" version="3.0"/>
<installed facet="sun.facet" version="9"/> <installed facet="sun.facet" version="9"/>
<installed facet="wst.jsdt.web" version="1.0"/> <installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>
code/MoyaWeb/WebContent/WEB-INF/web.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"> <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
id="WebApp_ID" version="3.0">
<display-name>LanBortalWeb</display-name> <display-name>LanBortalWeb</display-name>
<session-config> <session-config>
<session-timeout>120</session-timeout> <session-timeout>120</session-timeout>
</session-config> </session-config>
<context-param> <context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name> <param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value> <!-- Production | Development -->
<!-- <param-value>Production</param-value> --> <param-value>Production</param-value>
</context-param> </context-param>
<context-param> <context-param>
<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name> <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
......
code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/shop/FoodShopView.java
...@@ -17,7 +17,7 @@ import fi.codecrew.moya.model.FoodWave; ...@@ -17,7 +17,7 @@ import fi.codecrew.moya.model.FoodWave;
import fi.codecrew.moya.web.annotations.SelectedUser; import fi.codecrew.moya.web.annotations.SelectedUser;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named @Named()
@ConversationScoped @ConversationScoped
public class FoodShopView extends GenericCDIView { public class FoodShopView extends GenericCDIView {
...@@ -26,7 +26,6 @@ public class FoodShopView extends GenericCDIView { ...@@ -26,7 +26,6 @@ public class FoodShopView extends GenericCDIView {
private static final long serialVersionUID = 1288114954999406683L; private static final long serialVersionUID = 1288114954999406683L;
@Inject @Inject
@SelectedUser @SelectedUser
private EventUser user; private EventUser user;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!