Skip to content

Max Mecklin / Moya

Go to a project
Commit 0a657a99 by Juho Juopperi
Options

merge

2 parents f016d612 9d192d70
Inline Side-by-side
Showing with 1022 additions and 108 deletions
code/LanBortal/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
#Sat Jun 12 05:11:41 EEST 2010
#Wed Oct 27 01:36:18 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.1
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalAuthModule/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs 0 → 100644
#Wed Oct 27 01:36:10 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalAuthModule/src/fi/insomnia/bortal/BortalLoginModule.java
......@@ -84,7 +84,7 @@ public class BortalLoginModule extends AppservPasswordLoginModule {
// Authenticate User
BortalRealm samplerealm = (BortalRealm) _currentRealm;
if (!authbean.authenticate(_username, new String(_passwd))) {
if (!authbean.authenticate(_username, new String(_password))) {
// Login fails
throw new LoginException((new StringBuilder())
.append("customrealm:Login Failed for user ")
......
code/LanBortalAuthModuleClient/.settings/org.eclipse.jdt.core.prefs
#Fri Jul 16 17:41:15 EEST 2010
#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.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
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
code/LanBortalAuthModuleClient/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs 0 → 100644
#Wed Oct 27 01:36:02 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalBeans/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
#Sat Jul 17 22:07:14 EEST 2010
#Wed Oct 27 01:35:59 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.1
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/AccountEventBean.java
......@@ -96,21 +96,24 @@ public class AccountEventBean implements AccountEventBeanLocal {
if (buyInstant && prodentry.getKey().getPrice().compareTo(BigDecimal.ZERO) > 0) {
tot = tot.add(prodentry.getValue().multiply(prodentry.getKey().getPrice()));
}
if (prodentry.getKey().isPrepaidInstant() && prodentry.getKey().getPlaces() != null && prodentry.getKey().getPlaces().size() > 0) {
for (Place p : prodentry.getKey().getPlaces()) {
if (!p.isTaken()) {
placebean.lockPlaces(shoppingUser, p);
break;
}
}
if (prodentry.getKey().isPrepaidInstant() && prodentry.getKey().getPlaces() != null && prodentry.getKey().getPlaces().size() > 0) {
logger.debug("Prepaidplace");
placebean.lockPlaceProduct(shoppingUser, prodentry.getKey(), BigDecimal.ONE);
// for (Place p : prodentry.getKey().getPlaces()) {
// if (!p.isTaken()) {
// logger.debug("Locking user {} to place {}", shoppingUser,p);
// placebean.lockPlaces(shoppingUser, p);
// break;
// }
// }
}
ac.setSeller(seller);
shoppingUser.getAccountEvents().add(ac);
}
logger.debug("ShopCash price {}", tot);
if (buyInstant && tot.compareTo(BigDecimal.ZERO) > 0) {
logger.debug("Creating buy instant product!");
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BillBean.java
......@@ -199,7 +199,7 @@ public class BillBean implements BillBeanLocal {
if (prod.isPrepaidInstant()) {
logger.debug("Creating Bill prepaidInstant product {}, {}", prod.getName(), bl.getQuantity());
if (prod.getPlaces().size() > 0) {
placebean.lockPlaces(bill.getUser(), prod, bl.getQuantity());
placebean.lockPlaceProduct(bill.getUser(), prod, bl.getQuantity());
}
productBean.createAccountEvent(prod, bl.getQuantity(), bill.getUser());
......
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceBean.java
......@@ -210,27 +210,46 @@ public class PlaceBean implements PlaceBeanLocal {
}
@Override
public void lockPlaces(User user, Product prod, BigDecimal quantity) {
public void lockPlaceProduct(User user, Product prod, BigDecimal quantity) {
user = userbean.mergeChanges(user);
BigDecimal loop = BigDecimal.ZERO;
LanEvent event = eventBean.getCurrentEvent();
PlaceGroup pg = new PlaceGroup(event, Calendar.getInstance(), Calendar.getInstance(), true);
pg.setCreator(user);
pgfacade.create(pg);
for (Place p : prod.getPlaces()) {
if (!p.isTaken()) {
p.reserve(user);
// p.reserve(user);
p.buy(pg);
pg.getMembers().add(new GroupMembership(event, pg, p, gmemfacade.createInviteToken(event)));
GroupMembership currgm = new GroupMembership(event, pg, p, gmemfacade.createInviteToken(event));
placeFacade.merge(p);
// pgbean.createGroupMembership(pg, p);
pg.getMembers().add(currgm);
loop = loop.add(BigDecimal.ONE);
if (quantity.equals(BigDecimal.ONE)) {
boolean gmassoc = false;
for (GroupMembership gm : user.getGroupMemberships()) {
if (gm.getId().getEventId().equals(event.getId())) {
gmassoc = true;
break;
}
}
if (!gmassoc) {
user.getGroupMemberships().add(currgm);
currgm.setUser(user);
}
}
if (loop.compareTo(quantity) >= 0) {
break;
}
}
}
pgfacade.create(pg);
}
@Override
......@@ -270,33 +289,42 @@ public class PlaceBean implements PlaceBeanLocal {
logger.warn("Place {} is already taken", place);
throw new PermissionDeniedException(secubean, userbean.getCurrentUser(), "NO RIGHT");
}
userbean.fatalPermission(Permission.SHOP, RolePermission.EXECUTE, "User tried to lock place without SHOP:EXECUTE");
LanEvent ev = eventBean.getCurrentEvent();
PlaceGroup pg = new PlaceGroup(ev, Calendar.getInstance(), Calendar.getInstance(), true);
pg.setCreator(user);
user.getPlaceGroups().add(pg);
place.reserve(user);
place.buy(pg);
pg.getMembers().add(new GroupMembership(ev, pg, place, gmemfacade.createInviteToken(ev)));
GroupMembership newgm = new GroupMembership(ev, pg, place, gmemfacade.createInviteToken(ev));
pg.getMembers().add(newgm);
boolean foundGm = false;
for (GroupMembership gm : user.getGroupMemberships()) {
logger.debug("Checking users gm:s found: {}", gm);
if (gm.getId().getEventId().equals(ev.getId())) {
foundGm = true;
break;
}
}
logger.debug("Foundgm {}", foundGm);
if (!foundGm) {
GroupMembership gm = pg.getMembers().get(0);
gm.setUser(user);
user.getGroupMemberships().add(gm);
logger.debug("Membership not found. associating");
newgm.setUser(user);
user.getGroupMemberships().add(newgm);
// gmemfacade.merge(gm);
userbean.mergeChanges(user);
}
pgfacade.create(pg);
place = placeFacade.merge(place);
// userbean.mergeChanges(user);
return placeFacade.merge(place);
return place;
}
}
code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceGroupBean.java
......@@ -165,7 +165,7 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override
public void releaseAndGenerateToken(GroupMembership gmem) {
if (!userbean.getCurrentUser().equals(gmem.getPlaceGroup().getCreator()) ||
if (!userbean.getCurrentUser().getId().equals(gmem.getPlaceGroup().getCreator().getId()) ||
!userbean.hasCurrentUserPermission(Permission.MAP, RolePermission.WRITE)) {
throw new PermissionDeniedException(secubean, userbean.getCurrentUser(), "User tried to release and generate group membership: " + gmem);
}
......
code/LanBortalBeansClient/.classpath
......@@ -3,7 +3,8 @@
<classpathentry kind="src" path="ejbModule"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry combineaccessrules="false" kind="src" path="/LanBortalAuthModuleClient"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)">
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="jst.utility;#system#"/>
</attributes>
......
code/LanBortalBeansClient/.settings/org.eclipse.jdt.core.prefs
#Thu Jul 15 01:16:17 EEST 2010
#Wed Oct 27 01:25:37 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.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
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
......
code/LanBortalBeansClient/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs 0 → 100644
#Wed Oct 27 01:35:51 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalBeansClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<fixed facet="jst.utility"/>
<fixed facet="jst.java"/>
<installed facet="jst.utility" version="1.0"/>
......
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceBeanLocal.java
......@@ -21,7 +21,7 @@ import fi.insomnia.bortal.model.User;
* @author tuukka
*/
@Local
//@RemoteDestination
// @RemoteDestination
public interface PlaceBeanLocal {
Place mergeChanges(Place place);
......@@ -38,8 +38,6 @@ public interface PlaceBeanLocal {
boolean buySelectedPlaces(EventMap e) throws BortalCatchableException;
void lockPlaces(User user, Product prod, BigDecimal quantity);
int setBuyable(EventMap map, String buyableLike, boolean b);
Place find(EventPk id);
......@@ -48,4 +46,6 @@ public interface PlaceBeanLocal {
Place lockPlaces(User rowData, Place place);
void lockPlaceProduct(User user, Product prod, BigDecimal quantity);
}
code/LanBortalDatabase/.classpath
......@@ -13,5 +13,10 @@
<attribute name="owner.project.facets" value="java"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="eclipse.fproj.jdt.libprov.osgi/jpt.jpa">
<attributes>
<attribute name="org.eclipse.jst.component.dependency" value="../"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="build/classes"/>
</classpath>
code/LanBortalDatabase/.externalToolBuilders/LanBortalDatabase JAR builder.launch
......@@ -3,7 +3,7 @@
<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.ATTR_REFRESH_RECURSIVE" value="false"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1269095341450_4&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/LanBortal/EarContent/lib/LanBortalDatabase.jar&quot; type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/LanBortal/EarContent/lib/LanBortalDatabase.jar&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/LanBortalDatabase/jarbuild.xml"/>
</listAttribute>
......@@ -13,8 +13,12 @@
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="LanBortalDatabase"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/LanBortalDatabase/src&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/LanBortalDatabase/jarbuild.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
</launchConfiguration>
code/LanBortalDatabase/.settings/org.eclipse.jpt.core.prefs
#Thu Jul 15 01:17:01 EEST 2010
#Thu Oct 28 16:55:14 EEST 2010
eclipse.preferences.version=1
org.eclipse.jpt.core.discoverAnnotatedClasses=true
org.eclipse.jpt.core.metamodelSourceFolderName=src
org.eclipse.jpt.core.platform=eclipselink2_1
code/LanBortalDatabase/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs 0 → 100644
#Wed Oct 27 01:35:48 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalDatabase/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml
<root>
<facet id="jpt.jpa">
<node name="libprov">
<attribute name="provider-id" value="jpa-no-op-library-provider"/>
<attribute name="provider-id" value="eclipselink-210-osgi-bundles-library-provider"/>
</node>
<node name="osgi-bundles-container">
<attribute name="bundles" value="javax.persistence:[2.0.0,2.1.0);org.eclipse.persistence.core:[2.1.0,2.2.0);org.eclipse.persistence.jpa:[2.1.0,2.2.0);org.eclipse.persistence.asm:[2.1.0,2.2.0);org.eclipse.persistence.antlr:[2.1.0,2.2.0)"/>
<attribute name="label" value="EclipseLink 2.1.x"/>
</node>
<node name="osgi-bundles-container"/>
</facet>
</root>
code/LanBortalDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<fixed facet="jst.utility"/>
<fixed facet="jst.java"/>
<fixed facet="jpt.jpa"/>
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.431+0300")
@StaticMetamodel(AccountEvent.class)
public class AccountEvent_ extends GenericEventChild_ {
public static volatile SingularAttribute<AccountEvent, Boolean> cash;
public static volatile SingularAttribute<AccountEvent, BigDecimal> unitPrice;
public static volatile SingularAttribute<AccountEvent, BigDecimal> quantity;
public static volatile SingularAttribute<AccountEvent, Calendar> eventTime;
public static volatile SingularAttribute<AccountEvent, Calendar> delivered;
public static volatile SingularAttribute<AccountEvent, FoodWave> foodWave;
public static volatile SingularAttribute<AccountEvent, Product> product;
public static volatile SingularAttribute<AccountEvent, User> user;
public static volatile SingularAttribute<AccountEvent, User> seller;
public static volatile ListAttribute<AccountEvent, DiscountInstance> discountInstances;
public static volatile SingularAttribute<AccountEvent, Bill> bill;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.501+0300")
@StaticMetamodel(BillLine.class)
public class BillLine_ {
public static volatile SingularAttribute<BillLine, EventPk> id;
public static volatile SingularAttribute<BillLine, String> name;
public static volatile SingularAttribute<BillLine, BigDecimal> quantity;
public static volatile SingularAttribute<BillLine, BigDecimal> unitPrice;
public static volatile SingularAttribute<BillLine, String> unitName;
public static volatile SingularAttribute<BillLine, BigDecimal> vat;
public static volatile SingularAttribute<BillLine, Bill> bill;
public static volatile SingularAttribute<BillLine, Integer> jpaVersionField;
public static volatile SingularAttribute<BillLine, Product> lineProduct;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.492+0300")
@StaticMetamodel(Bill.class)
public class Bill_ extends GenericEventChild_ {
public static volatile SingularAttribute<Bill, Calendar> paidDate;
public static volatile SingularAttribute<Bill, Integer> billNumber;
public static volatile SingularAttribute<Bill, String> addr1;
public static volatile SingularAttribute<Bill, String> addr2;
public static volatile SingularAttribute<Bill, String> addr3;
public static volatile SingularAttribute<Bill, String> addr4;
public static volatile SingularAttribute<Bill, String> addr5;
public static volatile SingularAttribute<Bill, Calendar> sentDate;
public static volatile SingularAttribute<Bill, Integer> paymentTime;
public static volatile SingularAttribute<Bill, String> noticetime;
public static volatile SingularAttribute<Bill, String> theirReference;
public static volatile SingularAttribute<Bill, String> ourReference;
public static volatile SingularAttribute<Bill, String> deliveryTerms;
public static volatile SingularAttribute<Bill, Integer> delayIntrest;
public static volatile SingularAttribute<Bill, String> notes;
public static volatile ListAttribute<Bill, BillLine> billLines;
public static volatile SingularAttribute<Bill, AccountEvent> accountEvent;
public static volatile SingularAttribute<Bill, User> user;
public static volatile SingularAttribute<Bill, LanEvent> event;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.509+0300")
@StaticMetamodel(CardTemplate.class)
public class CardTemplate_ {
public static volatile SingularAttribute<CardTemplate, EventPk> id;
public static volatile SingularAttribute<CardTemplate, byte[]> image;
public static volatile SingularAttribute<CardTemplate, String> name;
public static volatile SingularAttribute<CardTemplate, Integer> power;
public static volatile ListAttribute<CardTemplate, Role> roles;
public static volatile ListAttribute<CardTemplate, PrintedCard> cards;
public static volatile SingularAttribute<CardTemplate, LanEvent> event;
public static volatile SingularAttribute<CardTemplate, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.570+0300")
@StaticMetamodel(CompoEntryFile.class)
public class CompoEntryFile_ {
public static volatile SingularAttribute<CompoEntryFile, EventPk> id;
public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
public static volatile SingularAttribute<CompoEntryFile, String> fileName;
public static volatile SingularAttribute<CompoEntryFile, String> description;
public static volatile SingularAttribute<CompoEntryFile, String> hash;
public static volatile SingularAttribute<CompoEntryFile, byte[]> fileData;
public static volatile SingularAttribute<CompoEntryFile, Calendar> uploaded;
public static volatile SingularAttribute<CompoEntryFile, CompoEntry> entry;
public static volatile SingularAttribute<CompoEntryFile, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.582+0300")
@StaticMetamodel(CompoEntryParticipant.class)
public class CompoEntryParticipant_ {
public static volatile SingularAttribute<CompoEntryParticipant, EventPk> id;
public static volatile SingularAttribute<CompoEntryParticipant, String> role;
public static volatile SingularAttribute<CompoEntryParticipant, String> nick;
public static volatile SingularAttribute<CompoEntryParticipant, Calendar> confirmed;
public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
public static volatile SingularAttribute<CompoEntryParticipant, User> user;
public static volatile SingularAttribute<CompoEntryParticipant, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.555+0300")
@StaticMetamodel(CompoEntry.class)
public class CompoEntry_ {
public static volatile SingularAttribute<CompoEntry, EventPk> id;
public static volatile SingularAttribute<CompoEntry, Calendar> created;
public static volatile SingularAttribute<CompoEntry, String> name;
public static volatile SingularAttribute<CompoEntry, String> notes;
public static volatile SingularAttribute<CompoEntry, String> screenMessage;
public static volatile SingularAttribute<CompoEntry, Integer> sort;
public static volatile SingularAttribute<CompoEntry, Integer> finalPosition;
public static volatile SingularAttribute<CompoEntry, CompoEntryFile> currentFile;
public static volatile ListAttribute<CompoEntry, Vote> votes;
public static volatile ListAttribute<CompoEntry, CompoEntryFile> files;
public static volatile ListAttribute<CompoEntry, CompoEntryParticipant> participants;
public static volatile SingularAttribute<CompoEntry, Compo> compo;
public static volatile SingularAttribute<CompoEntry, User> creator;
public static volatile SingularAttribute<CompoEntry, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.547+0300")
@StaticMetamodel(Compo.class)
public class Compo_ {
public static volatile SingularAttribute<Compo, EventPk> id;
public static volatile SingularAttribute<Compo, String> name;
public static volatile SingularAttribute<Compo, Calendar> startTime;
public static volatile SingularAttribute<Compo, Calendar> voteStart;
public static volatile SingularAttribute<Compo, Calendar> voteEnd;
public static volatile SingularAttribute<Compo, Calendar> submitStart;
public static volatile SingularAttribute<Compo, Calendar> submitEnd;
public static volatile SingularAttribute<Compo, String> description;
public static volatile SingularAttribute<Compo, Integer> maxParticipantCount;
public static volatile SingularAttribute<Compo, Boolean> holdVoting;
public static volatile ListAttribute<Compo, CompoEntry> compoEntries;
public static volatile SingularAttribute<Compo, LanEvent> event;
public static volatile SingularAttribute<Compo, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.609+0300")
@StaticMetamodel(DiscountInstance.class)
public class DiscountInstance_ extends GenericEventChild_ {
public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
public static volatile SingularAttribute<DiscountInstance, Discount> discount;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.590+0300")
@StaticMetamodel(Discount.class)
public class Discount_ extends GenericEventChild_ {
public static volatile SingularAttribute<Discount, BigDecimal> percentage;
public static volatile SingularAttribute<Discount, String> code;
public static volatile SingularAttribute<Discount, String> details;
public static volatile SingularAttribute<Discount, String> shortdesc;
public static volatile SingularAttribute<Discount, BigDecimal> amountMin;
public static volatile SingularAttribute<Discount, BigDecimal> amountMax;
public static volatile SingularAttribute<Discount, Boolean> active;
public static volatile SingularAttribute<Discount, BigDecimal> maxNum;
public static volatile SingularAttribute<Discount, BigDecimal> perUser;
public static volatile SingularAttribute<Discount, BigDecimal> totalCount;
public static volatile ListAttribute<Discount, DiscountInstance> discountInstances;
public static volatile SingularAttribute<Discount, Role> role;
public static volatile ListAttribute<Discount, Product> products;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventChildInterface.java
......@@ -7,12 +7,11 @@ package fi.insomnia.bortal.model;
import java.io.Serializable;
/**
*
* @author tuukka
*/
public interface EventChildInterface extends Serializable{
public interface EventChildInterface extends Serializable {
EventPk getId();
......@@ -21,5 +20,5 @@ public interface EventChildInterface extends Serializable{
void setJpaVersionField(int jpaVersionField);
int getJpaVersionField();
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.617+0300")
@StaticMetamodel(EventMap.class)
public class EventMap_ {
public static volatile SingularAttribute<EventMap, EventPk> id;
public static volatile SingularAttribute<EventMap, byte[]> mapData;
public static volatile SingularAttribute<EventMap, String> name;
public static volatile ListAttribute<EventMap, Place> places;
public static volatile SingularAttribute<EventMap, LanEvent> event;
public static volatile SingularAttribute<EventMap, Integer> jpaVersionField;
public static volatile ListAttribute<EventMap, Reader> readers;
public static volatile SingularAttribute<EventMap, Boolean> active;
public static volatile SingularAttribute<EventMap, String> notes;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.670+0300")
@StaticMetamodel(EventOrganiser.class)
public class EventOrganiser_ {
public static volatile SingularAttribute<EventOrganiser, Integer> id;
public static volatile SingularAttribute<EventOrganiser, String> organisation;
public static volatile SingularAttribute<EventOrganiser, String> bundleCountry;
public static volatile ListAttribute<EventOrganiser, LanEvent> events;
public static volatile SingularAttribute<EventOrganiser, User> admin;
public static volatile SingularAttribute<EventOrganiser, Integer> jpaVersionField;
public static volatile SingularAttribute<EventOrganiser, String> billAddress1;
public static volatile SingularAttribute<EventOrganiser, String> billAddress2;
public static volatile SingularAttribute<EventOrganiser, String> billAddress3;
public static volatile SingularAttribute<EventOrganiser, String> billAddress4;
public static volatile SingularAttribute<EventOrganiser, String> bankNumber1;
public static volatile SingularAttribute<EventOrganiser, String> bankNumber2;
public static volatile SingularAttribute<EventOrganiser, String> bankName1;
public static volatile SingularAttribute<EventOrganiser, String> bankName2;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventPk.java
package fi.insomnia.bortal.model;
import java.io.Serializable;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
/**
* Entity implementation class for Entity: EntityPK
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventPk_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.688+0300")
@StaticMetamodel(EventPk.class)
public class EventPk_ {
public static volatile SingularAttribute<EventPk, Integer> id;
public static volatile SingularAttribute<EventPk, Integer> eventId;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventStatus_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.723+0300")
@StaticMetamodel(EventStatus.class)
public class EventStatus_ {
public static volatile SingularAttribute<EventStatus, Integer> id;
public static volatile SingularAttribute<EventStatus, String> name;
public static volatile ListAttribute<EventStatus, LanEvent> events;
public static volatile SingularAttribute<EventStatus, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.736+0300")
@StaticMetamodel(FoodWaveTemplate.class)
public class FoodWaveTemplate_ {
public static volatile SingularAttribute<FoodWaveTemplate, EventPk> id;
public static volatile SingularAttribute<FoodWaveTemplate, String> name;
public static volatile SingularAttribute<FoodWaveTemplate, String> description;
public static volatile ListAttribute<FoodWaveTemplate, Product> products;
public static volatile SingularAttribute<FoodWaveTemplate, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.730+0300")
@StaticMetamodel(FoodWave.class)
public class FoodWave_ {
public static volatile SingularAttribute<FoodWave, EventPk> id;
public static volatile SingularAttribute<FoodWave, String> name;
public static volatile SingularAttribute<FoodWave, String> description;
public static volatile SingularAttribute<FoodWave, Calendar> time;
public static volatile SingularAttribute<FoodWave, Boolean> closed;
public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
public static volatile SingularAttribute<FoodWave, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.747+0300")
@StaticMetamodel(GenericEntity.class)
public class GenericEntity_ {
public static volatile SingularAttribute<GenericEntity, Integer> id;
public static volatile SingularAttribute<GenericEntity, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEventChild.java
......@@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory;
import fi.insomnia.bortal.utilities.PasswordFunctions;
@MappedSuperclass
public class GenericEventChild implements EventChildInterface {
public abstract class GenericEventChild implements EventChildInterface {
private static final Logger logger = LoggerFactory.getLogger(GenericEventChild.class);
/**
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEventChild_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.767+0300")
@StaticMetamodel(GenericEventChild.class)
public class GenericEventChild_ {
public static volatile SingularAttribute<GenericEventChild, EventPk> id;
public static volatile SingularAttribute<GenericEventChild, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.777+0300")
@StaticMetamodel(GroupMembership.class)
public class GroupMembership_ {
public static volatile SingularAttribute<GroupMembership, EventPk> id;
public static volatile SingularAttribute<GroupMembership, String> inviteToken;
public static volatile SingularAttribute<GroupMembership, Calendar> inviteAccepted;
public static volatile SingularAttribute<GroupMembership, String> inviteEmail;
public static volatile SingularAttribute<GroupMembership, String> inviteName;
public static volatile SingularAttribute<GroupMembership, PlaceGroup> placeGroup;
public static volatile SingularAttribute<GroupMembership, Place> placeReservation;
public static volatile SingularAttribute<GroupMembership, User> user;
public static volatile SingularAttribute<GroupMembership, Calendar> enteredEvent;
public static volatile SingularAttribute<GroupMembership, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.867+0300")
@StaticMetamodel(LanEvent.class)
public class LanEvent_ {
public static volatile SingularAttribute<LanEvent, Integer> id;
public static volatile SingularAttribute<LanEvent, Calendar> startTime;
public static volatile SingularAttribute<LanEvent, Calendar> endTime;
public static volatile SingularAttribute<LanEvent, String> name;
public static volatile SingularAttribute<LanEvent, String> referer;
public static volatile SingularAttribute<LanEvent, Integer> referenceNumberBase;
public static volatile SingularAttribute<LanEvent, Integer> nextBillNumber;
public static volatile SingularAttribute<LanEvent, EventOrganiser> organiser;
public static volatile SingularAttribute<LanEvent, EventStatus> status;
public static volatile ListAttribute<LanEvent, LogEntry> logEntries;
public static volatile SingularAttribute<LanEvent, Role> defaultRole;
public static volatile ListAttribute<LanEvent, Compo> compos;
public static volatile ListAttribute<LanEvent, CardTemplate> cardTemplates;
public static volatile ListAttribute<LanEvent, EventMap> eventMaps;
public static volatile ListAttribute<LanEvent, Role> roles;
public static volatile SingularAttribute<LanEvent, Integer> jpaVersionField;
public static volatile ListAttribute<LanEvent, Bill> bills;
public static volatile ListAttribute<LanEvent, Reader> readers;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.876+0300")
@StaticMetamodel(Location.class)
public class Location_ {
public static volatile SingularAttribute<Location, EventPk> id;
public static volatile SingularAttribute<Location, String> name;
public static volatile ListAttribute<Location, Reader> readers;
public static volatile ListAttribute<Location, PrintedCard> printedCardsAtLocation;
public static volatile SingularAttribute<Location, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.899+0300")
@StaticMetamodel(LogEntryType.class)
public class LogEntryType_ {
public static volatile SingularAttribute<LogEntryType, Integer> id;
public static volatile SingularAttribute<LogEntryType, String> name;
public static volatile SingularAttribute<LogEntryType, String> description;
public static volatile ListAttribute<LogEntryType, LogEntry> logEntries;
public static volatile SingularAttribute<LogEntryType, Integer> jpaVersionField;
public static volatile SingularAttribute<LogEntryType, Integer> logLevel;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.891+0300")
@StaticMetamodel(LogEntry.class)
public class LogEntry_ {
public static volatile SingularAttribute<LogEntry, Integer> id;
public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
public static volatile SingularAttribute<LogEntry, Calendar> time;
public static volatile SingularAttribute<LogEntry, String> description;
public static volatile SingularAttribute<LogEntry, LogEntryType> type;
public static volatile SingularAttribute<LogEntry, User> user;
public static volatile SingularAttribute<LogEntry, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.952+0300")
@StaticMetamodel(NewsGroup.class)
public class NewsGroup_ {
public static volatile SingularAttribute<NewsGroup, EventPk> id;
public static volatile SingularAttribute<NewsGroup, String> name;
public static volatile SingularAttribute<NewsGroup, String> description;
public static volatile SingularAttribute<NewsGroup, Integer> priority;
public static volatile ListAttribute<NewsGroup, News> news;
public static volatile ListAttribute<NewsGroup, Role> roles;
public static volatile SingularAttribute<NewsGroup, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.906+0300")
@StaticMetamodel(News.class)
public class News_ {
public static volatile SingularAttribute<News, EventPk> id;
public static volatile SingularAttribute<News, String> title;
public static volatile SingularAttribute<News, String> body;
public static volatile SingularAttribute<News, String> bodyAbstract;
public static volatile SingularAttribute<News, Calendar> publish;
public static volatile SingularAttribute<News, Calendar> expire;
public static volatile SingularAttribute<News, Integer> priority;
public static volatile SingularAttribute<News, NewsGroup> group;
public static volatile SingularAttribute<News, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup.java
......@@ -4,6 +4,7 @@
*/
package fi.insomnia.bortal.model;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
......@@ -70,7 +71,7 @@ public class PlaceGroup implements EventChildInterface {
private User creator;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "placeGroup")
private List<GroupMembership> members;
private List<GroupMembership> members = new ArrayList<GroupMembership>();
@OneToMany(mappedBy = "group")
@OrderBy("name")
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.973+0300")
@StaticMetamodel(PlaceGroup.class)
public class PlaceGroup_ {
public static volatile SingularAttribute<PlaceGroup, EventPk> id;
public static volatile SingularAttribute<PlaceGroup, Calendar> created;
public static volatile SingularAttribute<PlaceGroup, Calendar> edited;
public static volatile SingularAttribute<PlaceGroup, String> code;
public static volatile SingularAttribute<PlaceGroup, String> name;
public static volatile SingularAttribute<PlaceGroup, Boolean> active;
public static volatile SingularAttribute<PlaceGroup, String> details;
public static volatile SingularAttribute<PlaceGroup, User> creator;
public static volatile ListAttribute<PlaceGroup, GroupMembership> members;
public static volatile ListAttribute<PlaceGroup, Place> places;
public static volatile SingularAttribute<PlaceGroup, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:24.967+0300")
@StaticMetamodel(Place.class)
public class Place_ extends GenericEventChild_ {
public static volatile SingularAttribute<Place, String> description;
public static volatile SingularAttribute<Place, String> name;
public static volatile SingularAttribute<Place, Integer> mapX;
public static volatile SingularAttribute<Place, Integer> mapY;
public static volatile SingularAttribute<Place, Integer> width;
public static volatile SingularAttribute<Place, Integer> height;
public static volatile SingularAttribute<Place, Calendar> releaseTime;
public static volatile SingularAttribute<Place, String> details;
public static volatile SingularAttribute<Place, String> code;
public static volatile SingularAttribute<Place, GroupMembership> placeReserver;
public static volatile SingularAttribute<Place, Boolean> buyable;
public static volatile SingularAttribute<Place, PlaceGroup> group;
public static volatile SingularAttribute<Place, Role> providesRole;
public static volatile SingularAttribute<Place, EventMap> map;
public static volatile SingularAttribute<Place, Product> product;
public static volatile SingularAttribute<Place, User> currentUser;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:25.010+0300")
@StaticMetamodel(PrintedCard.class)
public class PrintedCard_ extends GenericEventChild_ {
public static volatile SingularAttribute<PrintedCard, Calendar> printTime;
public static volatile SingularAttribute<PrintedCard, String> barcode;
public static volatile SingularAttribute<PrintedCard, Boolean> enabled;
public static volatile SingularAttribute<PrintedCard, String> rfidUid;
public static volatile ListAttribute<PrintedCard, ReaderEvent> readerEvents;
public static volatile SingularAttribute<PrintedCard, Integer> printCount;
public static volatile SingularAttribute<PrintedCard, Location> currentLocation;
public static volatile SingularAttribute<PrintedCard, User> user;
public static volatile SingularAttribute<PrintedCard, CardTemplate> template;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.math.BigDecimal;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:25.029+0300")
@StaticMetamodel(Product.class)
public class Product_ extends GenericEventChild_ {
public static volatile SingularAttribute<Product, String> name;
public static volatile SingularAttribute<Product, BigDecimal> price;
public static volatile SingularAttribute<Product, Integer> sort;
public static volatile SingularAttribute<Product, String> barcode;
public static volatile SingularAttribute<Product, Boolean> prepaid;
public static volatile SingularAttribute<Product, Boolean> prepaidInstant;
public static volatile SingularAttribute<Product, Role> provides;
public static volatile ListAttribute<Product, Place> places;
public static volatile ListAttribute<Product, AccountEvent> accountEvents;
public static volatile ListAttribute<Product, Discount> discounts;
public static volatile SingularAttribute<Product, BigDecimal> vat;
public static volatile SingularAttribute<Product, String> unitName;
public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader.java
......@@ -4,6 +4,8 @@
*/
package fi.insomnia.bortal.model;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.EmbeddedId;
import javax.persistence.Entity;
......@@ -13,6 +15,7 @@ import javax.persistence.Lob;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Version;
import javax.persistence.UniqueConstraint;
......@@ -33,11 +36,14 @@ public class Reader extends GenericEventChild {
super();
}
public Reader(LanEvent ev, String iden) {
public Reader(LanEvent ev, String ident) {
super(ev);
this.identification = ident;
}
private Integer gamepoints;
private Integer maxEvents;
/**
*
*/
......@@ -71,6 +77,9 @@ public class Reader extends GenericEventChild {
@Column(name = "map_y")
private Integer mapY;
@OneToMany(mappedBy = "reader")
private List<ReaderEvent> events;
public String getIdentification() {
return identification;
}
......@@ -148,4 +157,28 @@ public class Reader extends GenericEventChild {
public LanEvent getEvent() {
return event;
}
public void setGamepoints(Integer gamepoints) {
this.gamepoints = gamepoints;
}
public Integer getGamepoints() {
return gamepoints;
}
public void setMaxEvents(Integer maxEvents) {
this.maxEvents = maxEvents;
}
public Integer getMaxEvents() {
return maxEvents;
}
public void setEvents(List<ReaderEvent> events) {
this.events = events;
}
public List<ReaderEvent> getEvents() {
return events;
}
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent.java
......@@ -40,6 +40,8 @@ public class ReaderEvent extends GenericEventChild {
@Column(name = "value")
private String value;
private Integer gaepoint;
@JoinColumns({
@JoinColumn(name = "printed_cards_id", referencedColumnName = "id", nullable = false, updatable = false),
@JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T21:00:17.154+0300")
@StaticMetamodel(ReaderEvent.class)
public class ReaderEvent_ extends GenericEventChild_ {
public static volatile SingularAttribute<ReaderEvent, Calendar> time;
public static volatile SingularAttribute<ReaderEvent, String> value;
public static volatile SingularAttribute<ReaderEvent, Integer> gaepoint;
public static volatile SingularAttribute<ReaderEvent, PrintedCard> printedCard;
public static volatile SingularAttribute<ReaderEvent, Reader> reader;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T21:00:17.122+0300")
@StaticMetamodel(Reader.class)
public class Reader_ extends GenericEventChild_ {
public static volatile SingularAttribute<Reader, Integer> gamepoints;
public static volatile SingularAttribute<Reader, Integer> maxEvents;
public static volatile SingularAttribute<Reader, String> identification;
public static volatile SingularAttribute<Reader, String> description;
public static volatile SingularAttribute<Reader, Location> location;
public static volatile SingularAttribute<Reader, EventMap> eventMap;
public static volatile SingularAttribute<Reader, LanEvent> event;
public static volatile SingularAttribute<Reader, Integer> mapX;
public static volatile SingularAttribute<Reader, Integer> mapY;
public static volatile ListAttribute<Reader, ReaderEvent> events;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleRight_.java 0 → 100644
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.enums.Permission;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:25.093+0300")
@StaticMetamodel(RoleRight.class)
public class RoleRight_ {
public static volatile SingularAttribute<RoleRight, EventPk> id;
public static volatile SingularAttribute<RoleRight, Boolean> read;
public static volatile SingularAttribute<RoleRight, Boolean> write;
public static volatile SingularAttribute<RoleRight, Boolean> execute;
public static volatile SingularAttribute<RoleRight, Permission> permission;
public static volatile SingularAttribute<RoleRight, Role> role;
public static volatile SingularAttribute<RoleRight, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java 0 → 100644
package fi.insomnia.bortal.model;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:25.086+0300")
@StaticMetamodel(Role.class)
public class Role_ extends GenericEventChild_ {
public static volatile SingularAttribute<Role, String> name;
public static volatile ListAttribute<Role, User> users;
public static volatile ListAttribute<Role, Role> children;
public static volatile ListAttribute<Role, Product> productsProvide;
public static volatile ListAttribute<Role, Place> placesProvide;
public static volatile ListAttribute<Role, Role> parents;
public static volatile ListAttribute<Role, RoleRight> roleRights;
public static volatile SingularAttribute<Role, CardTemplate> cardTemplate;
public static volatile ListAttribute<Role, Discount> discounts;
public static volatile ListAttribute<Role, NewsGroup> newsGroups;
public static volatile SingularAttribute<Role, LanEvent> event;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:25.120+0300")
@StaticMetamodel(UserImage.class)
public class UserImage_ {
public static volatile SingularAttribute<UserImage, Integer> id;
public static volatile SingularAttribute<UserImage, Calendar> uploaded;
public static volatile SingularAttribute<UserImage, String> name;
public static volatile SingularAttribute<UserImage, String> description;
public static volatile SingularAttribute<UserImage, String> mimeType;
public static volatile SingularAttribute<UserImage, byte[]> imageData;
public static volatile SingularAttribute<UserImage, User> user;
public static volatile SingularAttribute<UserImage, User> defaultImage;
public static volatile SingularAttribute<UserImage, Integer> jpaVersionField;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java 0 → 100644
package fi.insomnia.bortal.model;
import fi.insomnia.bortal.enums.Gender;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.ListAttribute;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:25.112+0300")
@StaticMetamodel(User.class)
public class User_ {
public static volatile SingularAttribute<User, Integer> id;
public static volatile SingularAttribute<User, Calendar> created;
public static volatile SingularAttribute<User, Boolean> active;
public static volatile SingularAttribute<User, String> password;
public static volatile SingularAttribute<User, String> lastname;
public static volatile SingularAttribute<User, String> firstnames;
public static volatile SingularAttribute<User, Calendar> birthday;
public static volatile SingularAttribute<User, String> nick;
public static volatile SingularAttribute<User, String> email;
public static volatile SingularAttribute<User, String> address;
public static volatile SingularAttribute<User, String> zip;
public static volatile SingularAttribute<User, String> postalTown;
public static volatile SingularAttribute<User, String> town;
public static volatile SingularAttribute<User, String> phone;
public static volatile SingularAttribute<User, UserImage> currentImage;
public static volatile SingularAttribute<User, Gender> gender;
public static volatile SingularAttribute<User, String> login;
public static volatile SingularAttribute<User, String> confirmHash;
public static volatile SingularAttribute<User, Calendar> confirmTime;
public static volatile SingularAttribute<User, Boolean> superadmin;
public static volatile ListAttribute<User, Vote> votes;
public static volatile ListAttribute<User, Role> roles;
public static volatile ListAttribute<User, LogEntry> logEntryList;
public static volatile ListAttribute<User, UserImage> userImageList;
public static volatile ListAttribute<User, CompoEntryParticipant> compoEntryParticipants;
public static volatile ListAttribute<User, CompoEntry> compoEntries;
public static volatile ListAttribute<User, PlaceGroup> placeGroups;
public static volatile ListAttribute<User, GroupMembership> groupMemberships;
public static volatile ListAttribute<User, Place> currentPlaces;
public static volatile ListAttribute<User, PrintedCard> printedCards;
public static volatile ListAttribute<User, AccountEvent> accountEvents;
public static volatile ListAttribute<User, Bill> bills;
public static volatile ListAttribute<User, AccountEvent> soldItems;
public static volatile SingularAttribute<User, Integer> jpaVersionField;
public static volatile ListAttribute<User, EventOrganiser> eventOrganiser;
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java 0 → 100644
package fi.insomnia.bortal.model;
import java.util.Calendar;
import javax.annotation.Generated;
import javax.persistence.metamodel.SingularAttribute;
import javax.persistence.metamodel.StaticMetamodel;
@Generated(value="Dali", date="2010-10-28T16:55:25.136+0300")
@StaticMetamodel(Vote.class)
public class Vote_ {
public static volatile SingularAttribute<Vote, EventPk> id;
public static volatile SingularAttribute<Vote, Integer> score;
public static volatile SingularAttribute<Vote, Calendar> time;
public static volatile SingularAttribute<Vote, CompoEntry> compoEntry;
public static volatile SingularAttribute<Vote, User> voter;
public static volatile SingularAttribute<Vote, Integer> jpaVersionField;
}
code/LanBortalFlash/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs 0 → 100644
#Wed Oct 27 01:35:14 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalUtilities/.classpath
......@@ -3,7 +3,8 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="src" path="/LanBortalBeansClient"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)">
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="owner.project.facets" value="jst.utility;#system#"/>
</attributes>
......
code/LanBortalUtilities/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
#Sat Jun 12 05:34:27 EEST 2010
#Wed Oct 27 01:35:28 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.1
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalUtilities/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<runtime name="GlassFish Server Open Source Edition 3 (Java EE 6)"/>
<fixed facet="jst.java"/>
<fixed facet="jst.utility"/>
<installed facet="jst.java" version="6.0"/>
......
code/LanBortalWeb/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
#Fri Aug 27 04:19:39 EEST 2010
#Wed Oct 27 01:35:40 EEST 2010
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=
XDOCLETHOME=/Users/jkj/Projects/Omnima/lib/xdoclet-1.2.3
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.1
XDOCLETVERSION=1.2.3
eclipse.preferences.version=1
code/LanBortalWeb/WebContent/product/createBill.xhtml
......@@ -12,8 +12,10 @@
<ui:define name="content">
#{productShopView.initUsershoppable()}
<products:shop commitaction="#{productShopView.commitBillCart()}" items="#{productShopView.billCart}"
commitValue="#{i18n['productshop.commit']}" />
<h:form id="billshopform">
<products:shop commitaction="#{productShopView.commitBillCart()}" items="#{productShopView.billCart}"
commitValue="#{i18n['productshop.commit']}" />
</h:form>
</ui:define>
</ui:composition>
</h:body>
......
code/LanBortalWeb/WebContent/resources/tools/products/shop.xhtml
......@@ -16,39 +16,38 @@
<h:outputScript target="head" library="script" name="jquery.min.js" />
<h:outputScript target="head" library="script" name="shopscript.js" />
<h:form id="shopform">
<h:dataTable border="0" id="billcart" value="#{cc.attrs.items}" var="cart">
<h:column>
<f:facet name="header">
<h:outputText id="name" value="${i18n['product.name']}" />
</f:facet>
<h:outputText value="#{cart.product.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.price']}" />
</f:facet>
<h:outputText id="price" value="#{cart.product.price}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText id="count" value="${i18n['product.cart.count']}" />
</f:facet>
<a href="#" onclick="return changeCartCount($(this).next().next(), -1)">-1</a>
<a href="#" onclick="return changeCartCount($(this).next(), -10)">-10</a>
<h:inputText size="4" id="cartcount" value="#{cart.count}" />
<a href="#" onclick="return changeCartCount($(this).prev(), +1)">+1</a>
<a href="#" onclick="return changeCartCount($(this).prev().prev(), +10)">+10</a>
<h:inputHidden value="#{cart.id}" />
</h:column>
</h:dataTable>
<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton" value="#{cc.attrs.commitValue}" />
</h:form>
<h:dataTable border="0" id="billcart" value="#{cc.attrs.items}" var="cart">
<h:column>
<f:facet name="header">
<h:outputText id="name" value="${i18n['product.name']}" />
</f:facet>
<h:outputText value="#{cart.product.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.price']}" />
</f:facet>
<h:outputText id="price" value="#{cart.product.price}">
<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText id="count" value="${i18n['product.cart.count']}" />
</f:facet>
<a href="#" onclick="return changeCartCount($(this).next().next(), -1)">-1</a>
<a href="#" onclick="return changeCartCount($(this).next(), -10)">-10</a>
<h:inputText size="4" id="cartcount" value="#{cart.count}" />
<a href="#" onclick="return changeCartCount($(this).prev(), +1)">+1</a>
<a href="#" onclick="return changeCartCount($(this).prev().prev(), +10)">+10</a>
<h:inputHidden value="#{cart.id}" />
</h:column>
</h:dataTable>
<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton" value="#{cc.attrs.commitValue}" />
......
code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
......@@ -18,16 +18,16 @@
<h:outputText value="#{productShopView.shoppingUser.accountBalance}">
<f:convertNumber />
</h:outputText>
<h:outputText value="#{i18n['product.shopInstant']}" />
<h:selectBooleanCheckbox value="#{productShopView.payInstant}" />
</h:panelGrid>
<h:form id="shoppingcartform">
<h:outputText value="#{i18n['product.shopInstant']}" />
<h:selectBooleanCheckbox value="#{productShopView.payInstant}" />
<products:shop commitaction="#{productShopView.commitShoppingCart()}" items="#{productShopView.billCart}"
commitValue="#{i18n['productshop.commit']}" />
<products:shop commitaction="#{productShopView.commitShoppingCart()}" items="#{productShopView.billCart}"
commitValue="#{i18n['productshop.commit']}" />
</h:form>
</ui:define>
......
code/LanBortalWeb/WebContent/user/adminSendImage.xhtml
......@@ -19,13 +19,23 @@
</h:panelGrid>
<users:sendImage />
<h:dataTable border="1" id="user" value="#{userView.user.userImageList}" var="img">
#{userView.initUserimagelist()}
<h:dataTable border="1" id="user" value="#{userView.userImageList}" var="img">
<h:column>
<h:outputText value="#{img.name}" />
</h:column>
<h:column>
<h:outputText value="#{img.mimeType}" />
</h:column>
<h:column>
<a href="#"
onclick="window.open('#{request.contextPath}/Userimage?imageid=#{img.id}', 'imagesubmitpopup', 'height=240,width=320'); this.target='imagesubmitpopup'; return true; ">
Näytä kuva
</a>
</h:column>
<h:column>
<h:commandButton action="#{userView.setDefaultImage()}" value="Set default image" />
</h:column>
</h:dataTable>
......
code/LanBortalWeb/WebContent/user/edit.xhtml
......@@ -21,13 +21,20 @@
<tools:canWrite target="MAP">
<h1>#{i18n['user.placegroups']}</h1>
<h:form id="placegrouplist">
<h:dataTable border="1" id="placegroup" value="#{userView.placegroups}" var="placegroup">
<h:column>
<f:facet name="header">
<h:outputText value="ID" />
</f:facet>
<h:outputText value="#{placegroup.id.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['placegroup.name']}" />
</f:facet>
<h:outputText value="#{placegroup.name}" />
......@@ -69,6 +76,9 @@
<h:column>
<h:outputText value="#{place.name}" />
</h:column>
<h:column>
<h:outputText rendered="#{! empty place.placeReserver}" value="#{place.placeReserver.user.nick}" />
</h:column>
</h:dataTable>
</h:column>
<h:column>
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/ProductShopView.java
......@@ -38,7 +38,7 @@ import fi.insomnia.bortal.view.helpers.ProductShopItem;
@ManagedBean(name = "productShopView")
@SessionScoped
public class ProductShopView {
public class ProductShopView extends GenericView {
private static final Logger logger = LoggerFactory.getLogger(ProductShopView.class);
@EJB
......@@ -107,6 +107,7 @@ public class ProductShopView {
while (cartIter.hasNext()) {
ProductShopItem shopitem = cartIter.next();
if (shopitem.getCount().compareTo(BigDecimal.ZERO) > 0) {
if (shopMap.containsKey(shopitem.getProduct())) {
FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(I18n.get("productshop.productFoundTwice")));
return null;
......@@ -116,12 +117,12 @@ public class ProductShopView {
}
List<AccountEvent> executed = accountEventBean.shopCash(shoppingUser, shopMap, isPayInstant());
this.addFaceMessage("Tuotteet ostettu");
return "success";
}
public void initUsershoppable() {
setPayInstant(true);
setPayInstant(false);
logger.debug("Creating new BillCart");
userBean.fatalPermission(Permission.BILL, RolePermission.EXECUTE);
......
code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java
......@@ -27,6 +27,7 @@ import fi.insomnia.bortal.model.GroupMembership;
import fi.insomnia.bortal.model.PlaceGroup;
import fi.insomnia.bortal.model.Role;
import fi.insomnia.bortal.model.User;
import fi.insomnia.bortal.model.UserImage;
import fi.insomnia.bortal.utilities.I18n;
@ManagedBean(name = "userView")
......@@ -53,6 +54,7 @@ public class UserView extends GenericView {
private String passwordcheck;
@EJB
private UtilBeanLocal utilbean;
private ListDataModel<UserImage> userImageList;
public void initCreateuser() {
user = new User();
......@@ -65,6 +67,12 @@ public class UserView extends GenericView {
}
public String setDefaultImage()
{
user.setCurrentImage(userImageList.getRowData());
userBean.mergeChanges(user);
return null;
}
public String edit() {
userBean.fatalPermission(Permission.USER_MANAGEMENT, RolePermission.READ);
......@@ -154,6 +162,10 @@ public class UserView extends GenericView {
}
return ret;
}
public void initUserimagelist()
{
setUserImageList(new ListDataModel<UserImage>(user.getUserImageList()));
}
public String saveUser() {
......@@ -256,4 +268,12 @@ public class UserView extends GenericView {
return shopview;
}
public void setUserImageList(ListDataModel<UserImage> userImageList) {
this.userImageList = userImageList;
}
public ListDataModel<UserImage> getUserImageList() {
return userImageList;
}
}
glassfishin_asennus.txt
......@@ -28,9 +28,10 @@ Huom! Lue komennot lpi ja muokkaa muuttujat sopiviksi!
#
# ./asadmin create-jdbc-connection-pool --datasourceclassname org.postgresql.ds.PGSimpleDataSource --restype javax.sql.DataSource --ping true --property serverName=localhost:DatabaseName=bortal:Password=U8uGeK7Sav:User=bortal Omniapossu
# ./asadmin create-jdbc-connection-pool --datasourceclassname org.postgresql.ds.PGConnectionPoolDataSource --restype javax.sql.ConnectionPoolDataSource --ping true --property serverName=localhost:DatabaseName=bortal:Password=U8uGeK7Sav:User=bortal Omniapossu
5. Lis JDBC resource jdbc/bortal connection poolille Omniapossu wepiklist.
./asadmin create-jdbc-resource --connectionpoolid Omniapossu jdbc/bortal
6. Debug-tulosteet fi namespacesta saa nkyviin seuraavasti:
# echo fi.level=FINEST >> glassfish/domains/domain1/config/logging.properties
......@@ -44,11 +45,13 @@ Huom! Lue komennot lpi ja muokkaa muuttujat sopiviksi!
9. Lis JMS connection factory ( Resources -> JMS Resources -> Connection Factory )
Pool name: jms/mailconnectionfactory
Resource type: javax.jms.QueueConnectionFactory
./asadmin create-jms-resource --restype javax.jms.QueueConnectionFactory jms/mailconnectionfactory
10. Lis JMS Destination Resource ( Resources -> JMS Resources -> Destination Resources )
JNDI Name: jms/mailque
Physical destinatino name: mailque
Resource type: javax.jms.Queue
./asadmin create-jms-resource --restype javax.jms.Queue --property Name=mailque jms/mailque
11. (OPTIONAL) Jos haluat JK-connectorin kyttn apachen kanssa:
Configurations -> Server-config -> Network Config -> http-listner1 -> JK Listener ON
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!