Muutettu persistence cache pois päältä ja jotain muuta pientä viilausta..

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BillLineBean.java

+package fi.insomnia.bortal.beans;
+
+import javax.ejb.Stateless;
+
+/**
+ * Session Bean implementation class BillLineBean
+ */
+@Stateless
+public class BillLineBean implements BillLineBeanLocal {
+
+    /**
+     * Default constructor. 
+     */
+    public BillLineBean() {
+        // TODO Auto-generated constructor stub
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/BillLineBeanLocal.java

+package fi.insomnia.bortal.beans;
+import javax.ejb.Local;
+
+@Local
+public interface BillLineBeanLocal {
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/TestDataBean.java

@@ -35,7 +35,7 @@ import java.util.List;
  */
  */
 @Stateless
 @Stateless
 @DeclareRoles(JaasBean.JAAS_SUPERADMINGROUP)
 @DeclareRoles(JaasBean.JAAS_SUPERADMINGROUP)
-@RolesAllowed(JaasBean.JAAS_SUPERADMINGROUP)
+//@RolesAllowed(JaasBean.JAAS_SUPERADMINGROUP)
 public class TestDataBean implements TestDataBeanLocal {
 public class TestDataBean implements TestDataBeanLocal {
 
 
     public static final String TEST_MAP_IMAGE_NAME = "testmap.png";
     public static final String TEST_MAP_IMAGE_NAME = "testmap.png";

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/enums/Role.java

+package fi.insomnia.bortal.enums;
+
+public enum Role {
+
+}

code/LanBortalDatabase/src/META-INF/persistence.xml

@@ -5,6 +5,8 @@
     <properties>
     <properties>
       <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
       <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
       <property name="eclipselink.ddl-generation.output-mode" value="both"/>
       <property name="eclipselink.ddl-generation.output-mode" value="both"/>
+      <property name="eclipselink.logging.level" value="ALL"/>
+      <property name="eclipselink.cache.type.default" value="NONE"/>
     </properties>
     </properties>
   </persistence-unit>
   </persistence-unit>
 </persistence>
 </persistence>

code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap.java

@@ -7,6 +7,7 @@ package fi.insomnia.bortal.model;
 import java.awt.image.BufferedImage;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 import javax.imageio.ImageIO;
 import javax.imageio.ImageIO;
@@ -23,6 +24,8 @@ import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Table;
 import javax.persistence.Version;
 import javax.persistence.Version;
 
 
+import org.eclipse.persistence.annotations.Cache;
+import org.eclipse.persistence.annotations.CacheType;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
@@ -32,8 +35,9 @@ import org.slf4j.LoggerFactory;
 @Entity
 @Entity
 @Table(name = "maps")
 @Table(name = "maps")
 @NamedQueries({
 @NamedQueries({
-    @NamedQuery(name = "EventMap.findAll", query = "SELECT e FROM EventMap e"),
-    @NamedQuery(name = "EventMap.findByName", query = "SELECT e FROM EventMap e WHERE e.name = :name")})
+        @NamedQuery(name = "EventMap.findAll", query = "SELECT e FROM EventMap e"),
+        @NamedQuery(name = "EventMap.findByName", query = "SELECT e FROM EventMap e WHERE e.name = :name") })
+@Cache(type = CacheType.NONE)
 public class EventMap implements EventChildInterface {
 public class EventMap implements EventChildInterface {
 
 
     private static final Logger logger = LoggerFactory.getLogger(EventMap.class);
     private static final Logger logger = LoggerFactory.getLogger(EventMap.class);
@@ -46,7 +50,7 @@ public class EventMap implements EventChildInterface {
     @Column(name = "map_name")
     @Column(name = "map_name")
     private String name;
     private String name;
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "map")
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "map")
-    private List<Place> places;
+    private List<Place> places = new ArrayList<Place>();
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     @JoinColumn(name = "event_id", referencedColumnName = "event_id", insertable = false, updatable = false, nullable = false)
     @JoinColumn(name = "event_id", referencedColumnName = "event_id", insertable = false, updatable = false, nullable = false)
     private Event event;
     private Event event;
@@ -168,7 +172,7 @@ public class EventMap implements EventChildInterface {
         BufferedImage image = ImageIO.read(new ByteArrayInputStream(getMapData()));
         BufferedImage image = ImageIO.read(new ByteArrayInputStream(getMapData()));
         List<Place> myplaces = getPlaces();
         List<Place> myplaces = getPlaces();
         logger.info("Getting places in Event map  {}, found {}", this, myplaces.size());
         logger.info("Getting places in Event map  {}, found {}", this, myplaces.size());
-        
+
         for (Place place : myplaces) {
         for (Place place : myplaces) {
             place.drawPlace(image);
             place.drawPlace(image);
         }
         }

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place.java

@@ -22,6 +22,9 @@ import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.persistence.Table;
 import javax.persistence.Version;
 import javax.persistence.Version;
 
 
+import org.eclipse.persistence.annotations.Cache;
+import org.eclipse.persistence.annotations.CacheType;
+
 /**
 /**
  * 
  * 
  */
  */
@@ -35,6 +38,7 @@ import javax.persistence.Version;
         @NamedQuery(name = "Place.findByMapY", query = "SELECT p FROM Place p WHERE p.mapY = :mapY"),
         @NamedQuery(name = "Place.findByMapY", query = "SELECT p FROM Place p WHERE p.mapY = :mapY"),
         @NamedQuery(name = "Place.findByDetails", query = "SELECT p FROM Place p WHERE p.details = :details"),
         @NamedQuery(name = "Place.findByDetails", query = "SELECT p FROM Place p WHERE p.details = :details"),
         @NamedQuery(name = "Place.findByCode", query = "SELECT p FROM Place p WHERE p.code = :code") })
         @NamedQuery(name = "Place.findByCode", query = "SELECT p FROM Place p WHERE p.code = :code") })
+@Cache(type =CacheType.NONE)
 public class Place implements EventChildInterface {
 public class Place implements EventChildInterface {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
@@ -56,12 +60,13 @@ public class Place implements EventChildInterface {
     @Column(name = "place_details")
     @Column(name = "place_details")
     @Lob
     @Lob
     private String details;
     private String details;
+
     @Column(name = "place_code")
     @Column(name = "place_code")
     private String code;
     private String code;
+
     @OneToOne(mappedBy = "placeReservation")
     @OneToOne(mappedBy = "placeReservation")
     private GroupMembership placeReserver;
     private GroupMembership placeReserver;
 
 
-    
     /**
     /**
      * Which group has bought the place
      * Which group has bought the place
      */
      */
@@ -71,12 +76,12 @@ public class Place implements EventChildInterface {
     @ManyToOne
     @ManyToOne
     private PlaceGroup group;
     private PlaceGroup group;
 
 
-
     @JoinColumns({
     @JoinColumns({
-            @JoinColumn(name = "map_id", referencedColumnName = "id"),
+            @JoinColumn(name = "map_id", referencedColumnName = "id", nullable = false, updatable = true, insertable = true),
             @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
             @JoinColumn(name = "event_id", referencedColumnName = "event_id", nullable = false, updatable = false, insertable = false) })
     @ManyToOne(optional = false)
     @ManyToOne(optional = false)
     private EventMap map;
     private EventMap map;
+
     /**
     /**
      * Which ticket type is this place sold as
      * Which ticket type is this place sold as
      */
      */
@@ -102,7 +107,7 @@ public class Place implements EventChildInterface {
     public Place(EventMap eventMap) {
     public Place(EventMap eventMap) {
         this.id = new EventPk();
         this.id = new EventPk();
         this.id.setEventId(eventMap.getId().getEventId());
         this.id.setEventId(eventMap.getId().getEventId());
-        
+
     }
     }
 
 
     public String getDescription() {
     public String getDescription() {
@@ -173,7 +178,7 @@ public class Place implements EventChildInterface {
             throw new RuntimeException("Can not set Map from different Event to Place!");
             throw new RuntimeException("Can not set Map from different Event to Place!");
         }
         }
         this.map = map;
         this.map = map;
-      //  this.mapId = map.getId().getId();
+        // this.mapId = map.getId().getId();
     }
     }
 
 
     public Product getProduct() {
     public Product getProduct() {

code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java

@@ -46,7 +46,6 @@ import fi.insomnia.bortal.utilities.PasswordFunctions;
         @NamedQuery(name = "User.findByEmail", query = "SELECT u FROM User u WHERE u.email = :email"),
         @NamedQuery(name = "User.findByEmail", query = "SELECT u FROM User u WHERE u.email = :email"),
         @NamedQuery(name = "User.findByAddress", query = "SELECT u FROM User u WHERE u.address = :address"),
         @NamedQuery(name = "User.findByAddress", query = "SELECT u FROM User u WHERE u.address = :address"),
         @NamedQuery(name = "User.findByZip", query = "SELECT u FROM User u WHERE u.zip = :zip"),
         @NamedQuery(name = "User.findByZip", query = "SELECT u FROM User u WHERE u.zip = :zip"),
-        @NamedQuery(name = "User.findByPostalCode", query = "SELECT u FROM User u WHERE u.postalCode = :postalCode"),
         @NamedQuery(name = "User.findByTown", query = "SELECT u FROM User u WHERE u.town = :town"),
         @NamedQuery(name = "User.findByTown", query = "SELECT u FROM User u WHERE u.town = :town"),
         @NamedQuery(name = "User.findByPhone", query = "SELECT u FROM User u WHERE u.phone = :phone"),
         @NamedQuery(name = "User.findByPhone", query = "SELECT u FROM User u WHERE u.phone = :phone"),
         @NamedQuery(name = "User.findByFemale", query = "SELECT u FROM User u WHERE u.female = :female"),
         @NamedQuery(name = "User.findByFemale", query = "SELECT u FROM User u WHERE u.female = :female"),