Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

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

@@ -5,7 +5,6 @@ import java.util.Calendar;
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
 
 
-import org.hibernate.validator.util.LoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 
 
 import fi.insomnia.bortal.facade.LogEntryFacade;
 import fi.insomnia.bortal.facade.LogEntryFacade;

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

@@ -12,15 +12,12 @@ import javax.ejb.Stateless;
 
 
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
-import fi.insomnia.bortal.facade.EventFacade;
 import fi.insomnia.bortal.facade.EventMapFacade;
 import fi.insomnia.bortal.facade.EventMapFacade;
 import fi.insomnia.bortal.facade.EventOrganiserFacade;
 import fi.insomnia.bortal.facade.EventOrganiserFacade;
 import fi.insomnia.bortal.facade.PlaceFacade;
 import fi.insomnia.bortal.facade.PlaceFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.model.Event;
 import fi.insomnia.bortal.model.Event;
 import fi.insomnia.bortal.model.EventMap;
 import fi.insomnia.bortal.model.EventMap;
-import fi.insomnia.bortal.model.EventOrganiser;
-import fi.insomnia.bortal.model.EventStatus;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.User;
 
 

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

@@ -11,7 +11,6 @@ import org.slf4j.LoggerFactory;
 
 
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.User;
-import fi.insomnia.bortal.utilities.PasswordFunctions;
 
 
 /**
 /**
  * Session Bean implementation class UserBean
  * Session Bean implementation class UserBean

code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceMapBeanLocal.java

@@ -6,7 +6,6 @@ import java.io.OutputStream;
 import javax.ejb.Local;
 import javax.ejb.Local;
 
 
 import fi.insomnia.bortal.model.Event;
 import fi.insomnia.bortal.model.Event;
-import fi.insomnia.bortal.model.Place;
 
 
 @Local
 @Local
 public interface PlaceMapBeanLocal {
 public interface PlaceMapBeanLocal {

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

@@ -4,7 +4,6 @@
  */
  */
 package fi.insomnia.bortal.enums;
 package fi.insomnia.bortal.enums;
 
 
-import javax.naming.directory.InvalidAttributesException;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 

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

@@ -5,7 +5,6 @@
     <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"/>
     </properties>
     </properties>
   </persistence-unit>
   </persistence-unit>
 </persistence>
 </persistence>

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

@@ -7,7 +7,6 @@ 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;
@@ -15,7 +14,6 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.ManyToOne;

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

@@ -16,7 +16,6 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 import javax.persistence.Version;
 
 
 /**
 /**

code/LanBortalWeb/src/fi/insomnia/bortal/servlet/PlaceMap.java

@@ -4,9 +4,7 @@
  */
  */
 package fi.insomnia.bortal.servlet;
 package fi.insomnia.bortal.servlet;
 
 
-import fi.insomnia.bortal.model.Place;
 import java.io.IOException;
 import java.io.IOException;
-import java.io.PrintWriter;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.servlet.ServletException;
 import javax.servlet.ServletException;

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

@@ -9,7 +9,6 @@ import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ManagedProperty;
 import javax.faces.bean.ManagedProperty;
 import javax.faces.bean.RequestScoped;
 import javax.faces.bean.RequestScoped;
 
 
-import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.beans.TestDataBeanLocal;
 import fi.insomnia.bortal.beans.TestDataBeanLocal;
 import fi.insomnia.bortal.handler.SessionHandler;
 import fi.insomnia.bortal.handler.SessionHandler;
 import fi.insomnia.bortal.model.Event;
 import fi.insomnia.bortal.model.Event;

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

@@ -6,14 +6,11 @@ import javax.ejb.EJB;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ManagedProperty;
 import javax.faces.bean.ManagedProperty;
 import javax.faces.bean.SessionScoped;
 import javax.faces.bean.SessionScoped;
-import javax.faces.context.FacesContext;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.ListDataModel;
-import javax.servlet.http.HttpSession;
 
 
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
-import fi.insomnia.bortal.HostnameFilter;
 import fi.insomnia.bortal.beans.SecurityBeanLocal;
 import fi.insomnia.bortal.beans.SecurityBeanLocal;
 import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
 import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;