merge

code/LanBortalBeans/.settings/org.eclipse.jdt.core.prefs

-#Sun Mar 07 12:22:07 EET 2010
+#Sun Mar 07 12:30:43 EET 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/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/UserBean.java

@@ -2,15 +2,15 @@ package fi.insomnia.bortal.beans;
 
 import java.util.List;
 
+import javax.ejb.EJB;
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import fi.insomnia.bortal.UserBeanLocal;
+import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.model.User;
 
 /**
@@ -18,16 +18,16 @@ import fi.insomnia.bortal.model.User;
  */
 @LocalBean
 @Stateless
-public class UserBean extends Generiimplements UserBeanLocal {
+public class UserBean implements UserBeanLocal {
 
     private static final Logger logger = LoggerFactory.getLogger(UserBean.class);
     /**
      * Java EE container injektoi t�m�n luokkamuuttujan luokan luonnin
      * yhteydess�.
      */
-    @PersistenceContext
-    private EntityManager em;
-
+    @EJB
+    private UserFacade userFacade;
+    
     /**
      * Default constructor.
      */
@@ -44,26 +44,23 @@ public class UserBean extends Generiimplements UserBeanLocal {
 	returnUser.setPassword(password);
 
 	// Tallennetaan olio kantaan...
-	em.persist(returnUser);
+	userFacade.create(returnUser);
 	return returnUser;
     }
 
     public List<User> getUsers() {
-	List<User> ret = em.createQuery("select u from User u", User.class)
-		.getResultList();
+        List<User> ret = userFacade.findAll();
 	logger.info("Found {} users from database ", ret.size());
 	return ret;
     }
 
     @Override
-    public void mergeChanges(User currentUser) {
-	em.merge(currentUser);
+    public void mergeChanges(User user) {
+        userFacade.merge(user);
     }
 
     public User getUser(String nick) {
-	User ret = em.createQuery("select u from User u where u.nick = :name",
-		User.class).setParameter("name", nick).getSingleResult();
-	return ret;
+        return userFacade.findByLogin(nick);
     }
 
 }

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/AccessRightFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.AccessRight;
+
+@Stateless
+@LocalBean
+public class AccessRightFacade extends GenericFacade<AccessRight> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public AccessRightFacade() {
+        super(AccessRight.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/AccountEventFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.AccountEvent;
+
+@Stateless
+@LocalBean
+public class AccountEventFacade extends GenericFacade<AccountEvent> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public AccountEventFacade() {
+        super(AccountEvent.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/BillFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Bill;
+
+@Stateless
+@LocalBean
+public class BillFacade extends GenericFacade<Bill> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public BillFacade() {
+        super(Bill.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/BillLineFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.BillLine;
+
+@Stateless
+@LocalBean
+public class BillLineFacade extends GenericFacade<BillLine> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public BillLineFacade() {
+        super(BillLine.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CardTemplateFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.CardTemplate;
+
+@Stateless
+@LocalBean
+public class CardTemplateFacade extends GenericFacade<CardTemplate> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public CardTemplateFacade() {
+        super(CardTemplate.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CompoEntryFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.CompoEntry;
+
+@Stateless
+@LocalBean
+public class CompoEntryFacade extends GenericFacade<CompoEntry> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public CompoEntryFacade() {
+        super(CompoEntry.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CompoEntryFileFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.CompoEntryFile;
+
+@Stateless
+@LocalBean
+public class CompoEntryFileFacade extends GenericFacade<CompoEntryFile> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public CompoEntryFileFacade() {
+        super(CompoEntryFile.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CompoEntryParticipantFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.CompoEntryParticipant;
+
+@Stateless
+@LocalBean
+public class CompoEntryParticipantFacade extends GenericFacade<CompoEntryParticipant> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public CompoEntryParticipantFacade() {
+        super(CompoEntryParticipant.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/CompoFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Compo;
+
+@Stateless
+@LocalBean
+public class CompoFacade extends GenericFacade<Compo> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public CompoFacade() {
+        super(Compo.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/DiscountFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Discount;
+
+@Stateless
+@LocalBean
+public class DiscountFacade extends GenericFacade<Discount> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public DiscountFacade() {
+        super(Discount.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/DiscountInstanceFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.DiscountInstance;
+
+@Stateless
+@LocalBean
+public class DiscountInstanceFacade extends GenericFacade<DiscountInstance> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public DiscountInstanceFacade() {
+        super(DiscountInstance.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Event;
+
+@Stateless
+@LocalBean
+public class EventFacade extends GenericFacade<Event> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public EventFacade() {
+        super(Event.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventMapFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.EventMap;
+
+@Stateless
+@LocalBean
+public class EventMapFacade extends GenericFacade<EventMap> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public EventMapFacade() {
+        super(EventMap.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventSettingsFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.EventSettings;
+
+@Stateless
+@LocalBean
+public class EventSettingsFacade extends GenericFacade<EventSettings> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public EventSettingsFacade() {
+        super(EventSettings.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/EventStatusFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.EventStatus;
+
+@Stateless
+@LocalBean
+public class EventStatusFacade extends GenericFacade<EventStatus> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public EventStatusFacade() {
+        super(EventStatus.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.FoodWave;
+
+@Stateless
+@LocalBean
+public class FoodWaveFacade extends GenericFacade<FoodWave> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public FoodWaveFacade() {
+        super(FoodWave.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/FoodWaveTemplateFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.FoodWaveTemplate;
+
+@Stateless
+@LocalBean
+public class FoodWaveTemplateFacade extends GenericFacade<FoodWaveTemplate> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public FoodWaveTemplateFacade() {
+        super(FoodWaveTemplate.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GenericFacade.java

@@ -14,8 +14,16 @@ import fi.insomnia.bortal.model.ModelInterface;
  */
 public abstract class GenericFacade<T extends ModelInterface> implements GenericFacadeLocal<T> {
 
-    protected abstract Class<T> getEntityClass();
-
+    private Class<T> entClass;
+    public GenericFacade(Class<T>entityClass)
+    {
+        this.entClass = entityClass;
+    }
+    protected Class<T> getEntityClass()
+    {
+        return entClass;
+    }
+    
     protected abstract EntityManager getEm();
 
     public void create(T entity) {

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/GroupMembershipFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.GroupMembership;
+
+@Stateless
+@LocalBean
+public class GroupMembershipFacade extends GenericFacade<GroupMembership> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public GroupMembershipFacade() {
+        super(GroupMembership.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/LocationFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Location;
+
+@Stateless
+@LocalBean
+public class LocationFacade extends GenericFacade<Location> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public LocationFacade() {
+        super(Location.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/LogEntryFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.LogEntry;
+
+@Stateless
+@LocalBean
+public class LogEntryFacade extends GenericFacade<LogEntry> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public LogEntryFacade() {
+        super(LogEntry.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/LogEntryTypeFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.LogEntryType;
+
+@Stateless
+@LocalBean
+public class LogEntryTypeFacade extends GenericFacade<LogEntryType> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public LogEntryTypeFacade() {
+        super(LogEntryType.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ModelInterfaceFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.ModelInterface;
+
+@Stateless
+@LocalBean
+public class ModelInterfaceFacade extends GenericFacade<ModelInterface> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public ModelInterfaceFacade() {
+        super(ModelInterface.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/NewsFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.News;
+
+@Stateless
+@LocalBean
+public class NewsFacade extends GenericFacade<News> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public NewsFacade() {
+        super(News.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/NewsGroupFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.NewsGroup;
+
+@Stateless
+@LocalBean
+public class NewsGroupFacade extends GenericFacade<NewsGroup> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public NewsGroupFacade() {
+        super(NewsGroup.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PlaceFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Place;
+
+@Stateless
+@LocalBean
+public class PlaceFacade extends GenericFacade<Place> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public PlaceFacade() {
+        super(Place.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PlaceGroupFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.PlaceGroup;
+
+@Stateless
+@LocalBean
+public class PlaceGroupFacade extends GenericFacade<PlaceGroup> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public PlaceGroupFacade() {
+        super(PlaceGroup.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/PrintedCardFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.PrintedCard;
+
+@Stateless
+@LocalBean
+public class PrintedCardFacade extends GenericFacade<PrintedCard> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public PrintedCardFacade() {
+        super(PrintedCard.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ProductFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Product;
+
+@Stateless
+@LocalBean
+public class ProductFacade extends GenericFacade<Product> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public ProductFacade() {
+        super(Product.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ReaderEventFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.ReaderEvent;
+
+@Stateless
+@LocalBean
+public class ReaderEventFacade extends GenericFacade<ReaderEvent> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public ReaderEventFacade() {
+        super(ReaderEvent.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/ReaderFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Reader;
+
+@Stateless
+@LocalBean
+public class ReaderFacade extends GenericFacade<Reader> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public ReaderFacade() {
+        super(Reader.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/RoleFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Role;
+
+@Stateless
+@LocalBean
+public class RoleFacade extends GenericFacade<Role> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public RoleFacade() {
+        super(Role.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/RoleInheritanceFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.RoleInheritance;
+
+@Stateless
+@LocalBean
+public class RoleInheritanceFacade extends GenericFacade<RoleInheritance> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public RoleInheritanceFacade() {
+        super(RoleInheritance.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/RoleRightFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.RoleRight;
+
+@Stateless
+@LocalBean
+public class RoleRightFacade extends GenericFacade<RoleRight> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public RoleRightFacade() {
+        super(RoleRight.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+
+import fi.insomnia.bortal.model.User;
+
+@Stateless
+@LocalBean
+public class UserFacade extends GenericFacade<User> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public UserFacade() {
+        super(User.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+    public User findByLogin(String login) {
+        TypedQuery<User> q = em.createNamedQuery("User.findByLogin",User.class);
+        q.setParameter(":login", login);
+        return q.getSingleResult();
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserImageFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.UserImage;
+
+@Stateless
+@LocalBean
+public class UserImageFacade extends GenericFacade<UserImage> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public UserImageFacade() {
+        super(UserImage.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/VoteFacade.java

+package fi.insomnia.bortal.facade;
+
+import javax.ejb.LocalBean;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import fi.insomnia.bortal.model.Vote;
+
+@Stateless
+@LocalBean
+public class VoteFacade extends GenericFacade<Vote> {
+
+    @PersistenceContext
+    private EntityManager em;
+
+    public VoteFacade() {
+        super(Vote.class);
+    }
+
+    protected EntityManager getEm() {
+        return em;
+    }
+
+}

code/LanBortalBeansClient/.settings/org.eclipse.jdt.core.prefs

-#Sun Mar 07 02:21:24 EET 2010
+#Sun Mar 07 12:30:50 EET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
@@ -75,7 +75,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.indentation.size=8
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
@@ -248,18 +248,18 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.lineSplit=9999
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=mixed
-org.eclipse.jdt.core.formatter.tabulation.size=8
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

code/LanBortalBeansClient/.settings/org.eclipse.jdt.ui.prefs

-#Sun Mar 07 02:21:24 EET 2010
+#Sun Mar 07 12:30:50 EET 2010
 eclipse.preferences.version=1
-formatter_profile=org.eclipse.jdt.ui.default.sun_profile
+formatter_profile=_InsomniaConventions
 formatter_settings_version=11

code/LanBortalDatabase/.settings/org.eclipse.jdt.core.prefs

-#Sun Mar 07 02:14:35 EET 2010
+#Sun Mar 07 12:30:58 EET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
@@ -80,7 +80,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.indentation.size=8
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
@@ -253,18 +253,18 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.lineSplit=9999
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=mixed
-org.eclipse.jdt.core.formatter.tabulation.size=8
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

code/LanBortalDatabase/.settings/org.eclipse.jdt.ui.prefs

-#Sun Mar 07 02:14:35 EET 2010
+#Sun Mar 07 12:30:58 EET 2010
 cleanup_settings_version=2
 eclipse.preferences.version=1
-formatter_profile=org.eclipse.jdt.ui.default.sun_profile
+formatter_profile=_InsomniaConventions
 formatter_settings_version=11

code/LanBortalWeb/.settings/org.eclipse.jdt.core.prefs

-#Sun Mar 07 02:21:40 EET 2010
+#Sun Mar 07 12:33:11 EET 2010
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
@@ -75,7 +75,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.indentation.size=8
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
@@ -248,18 +248,18 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constan
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
 org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=80
+org.eclipse.jdt.core.formatter.lineSplit=9999
 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=mixed
-org.eclipse.jdt.core.formatter.tabulation.size=8
+org.eclipse.jdt.core.formatter.tabulation.char=space
+org.eclipse.jdt.core.formatter.tabulation.size=4
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

code/LanBortalWeb/.settings/org.eclipse.jdt.ui.prefs

-#Sun Mar 07 02:21:40 EET 2010
+#Sun Mar 07 12:33:11 EET 2010
 eclipse.preferences.version=1
-formatter_profile=org.eclipse.jdt.ui.default.sun_profile
+formatter_profile=_InsomniaConventions
 formatter_settings_version=11

code/LanBortalWeb/WebContent/WEB-INF/web.xml

@@ -17,6 +17,13 @@
     <servlet-name>Faces Servlet</servlet-name>
     <url-pattern>*.jsf</url-pattern>
   </servlet-mapping>
-  
-  
+  <filter>
+    <display-name>EventI18nFilter</display-name>
+    <filter-name>EventI18nFilter</filter-name>
+    <filter-class>fi.insomnia.bortal.i18n.EventI18nFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>EventI18nFilter</filter-name>
+    <url-pattern>/EventI18nFilter</url-pattern>
+  </filter-mapping>
 </web-app>
\ No newline at end of file

code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java

@@ -20,8 +20,7 @@ public class UserView {
     @EJB
     private UserBeanLocal userBean;
 
-    private static final Logger logger = LoggerFactory
-	    .getLogger(UserView.class);
+    private static final Logger logger = LoggerFactory.getLogger(UserView.class);
 
     private User user;
 
@@ -38,9 +37,9 @@ public class UserView {
 
     public String createUser() {
 	logger.info("Saving user");
-	// Luodaan uusi k�ytt�j� UserBeanin funktiolla createNewUser jolle
+	// Luodaan uusi kÔøΩyttÔøΩjÔøΩ UserBeanin funktiolla createNewUser jolle
 	// annetaan parametrina pakolliset tiedot ( nick ja salasana )
-	// Paluuarvona saadaan uusi uljas k�ytt�j�-olio.
+	// Paluuarvona saadaan uusi uljas kÔøΩyttÔøΩjÔøΩ-olio.
 	setUser(userBean.createNewUser(nick, password));
 	nick = "";
 	password = "";
@@ -68,6 +67,7 @@ public class UserView {
 
     public String getNick() {
 	return nick;
+	
     }
 
     public void setNick(String nick) {