Merge branch 'master' of codecrew.fi:bortal

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

@@ -7,7 +7,7 @@ import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-09-05T21:51:25.846+0300")
+@Generated(value="Dali", date="2012-10-06T04:04:21.088+0300")
 @StaticMetamodel(Product.class)
 public class Product_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Product, LanEvent> event;
@@ -19,10 +19,10 @@ public class Product_ extends GenericEntity_ {
 	public static volatile SetAttribute<Product, ProductFlag> productFlags;
 	public static volatile SingularAttribute<Product, Role> provides;
 	public static volatile ListAttribute<Product, Place> places;
-	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
 	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;
+	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
 }

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

@@ -6,10 +6,9 @@ import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
 
-@Generated(value="Dali", date="2012-09-10T17:55:33.516+0300")
+@Generated(value="Dali", date="2012-10-06T04:04:21.120+0300")
 @StaticMetamodel(Reader.class)
 public class Reader_ extends GenericEntity_ {
-	public static volatile SingularAttribute<Reader, ReaderType> type;
 	public static volatile SingularAttribute<Reader, LanEvent> event;
 	public static volatile SingularAttribute<Reader, Integer> gamepoints;
 	public static volatile SingularAttribute<Reader, Integer> maxEvents;
@@ -21,4 +20,5 @@ public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, Integer> mapX;
 	public static volatile SingularAttribute<Reader, Integer> mapY;
 	public static volatile ListAttribute<Reader, ReaderEvent> events;
+	public static volatile SingularAttribute<Reader, ReaderType> type;
 }