merge

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

@@ -97,7 +97,7 @@ public class TestDataBean implements TestDataBeanLocal {
      */
      */
     public Event generateMetaData() {
     public Event generateMetaData() {
         EventStatus status = new EventStatus();
         EventStatus status = new EventStatus();
-        status.setStatusName("BLAAH");
+        status.setName("BLAAH");
 
 
         eventStatusFacade.create(status);
         eventStatusFacade.create(status);
 
 

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

@@ -21,7 +21,6 @@ import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 import javax.persistence.Version;
 
 
-import org.eclipse.persistence.annotations.PrimaryKey;
 
 
 /**
 /**
  * 
  * 
@@ -212,4 +211,5 @@ public class Product implements EventChildInterface {
     public List<FoodWaveTemplate> getFoodWaveTemplates() {
     public List<FoodWaveTemplate> getFoodWaveTemplates() {
         return foodWaveTemplates;
         return foodWaveTemplates;
     }
     }
+ 
 }
 }