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

Conflicts:
	code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/PlaceMapBean.java

Glassfishin_asennus

@@ -2,26 +2,27 @@
 
 HUOM!!!!
 
-Stablessa glasfishissä on ainakin kirjoitushetkellä bugi nemaed queryjen kanssa. 3.1 betassa tämä on korjattu!
+Stablessa glasfishiss on ainakin kirjoitushetkell bugi nemaed queryjen kanssa. 3.1 betassa tm on korjattu!
 
 ################################################
 
 
-bortal realmin lisääminen glassfishiin.
+bortal realmin lisminen glassfishiin.
 
-1. Lisää code/LanBortalAuthModule.jar tiedosto hakemistoon glassfish/glassfish/domains/domain1/lib/
+1. Lis code/LanBortalAuthModule.jar tiedosto hakemistoon glassfish/glassfish/domains/domain1/lib/
  
-2. lisää tiedostoon glassfish/glassfish/domains/domain1/config/login.conf tiedostoon:
+2. lis tiedostoon glassfish/glassfish/domains/domain1/config/login.conf tiedostoon:
 
 bortalRealm {
        fi.insomnia.bortal.BortalLoginModule required;
 };
 
 
+
 3. suorita seuraava komento hakemistossa glassfish/glassfish/bin/  
 ./asadmin create-auth-realm --classname fi.insomnia.bortal.BortalRealm --property jaas-context=bortalRealm omniarealm 
 
 
 ./asadmin create-jdbc-connection-pool --datasourceclassname org.postgresql.ds.PGSimpleDataSource --restype javax.sql.DataSource --ping true --property DatabaseName=BortalDb:Password=derkoppa:User=bortal Omniapossu
 
-Lisää JDBC resource jdbc/bortal connection poolille Omniapossu wepikälistä.
\ No newline at end of file
+Lis JDBC resource jdbc/bortal connection poolille Omniapossu wepiklist.
\ No newline at end of file

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

@@ -17,6 +17,7 @@ import fi.insomnia.bortal.facade.PlaceFacade;
 import fi.insomnia.bortal.facade.UserFacade;
 import fi.insomnia.bortal.model.Event;
 import fi.insomnia.bortal.model.EventMap;
+import fi.insomnia.bortal.model.EventPk;
 import fi.insomnia.bortal.model.Place;
 import fi.insomnia.bortal.model.PlaceGroup;
 import fi.insomnia.bortal.model.User;
@@ -63,7 +64,7 @@ public class PlaceMapBean implements PlaceMapBeanLocal {
 
 
         List<Place> places = map.getPlaces();
-
+        logger.info("Places: from map {}", places.size());
         BufferedImage image = map.getMapWithPlaces();
 
         if (userId != null) {

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

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

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.model.User;
-import fi.insomnia.bortal.utilities.PasswordFunctions;
 
 /**
  * Session Bean implementation class UserBean

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

@@ -6,19 +6,21 @@
 package fi.insomnia.bortal.enums;
 
 /**
- *
+ * 
  * @author tuukka
  */
 public enum EventStatusEnum {
-    NOT_STARTED,
-    SPLITTED;
-
+    INACTIVE, // Not yet public
+    NOT_STARTED, // Upcoming event
+    RUNNING, // Ongoing event
+    SPLITTED, // Detached: The event has a copy of it's database. SPLITTED event
+              // cannot be modified.
+    ARCHIVED; // Past events are archived
 
     public static EventStatusEnum getEventStatusEnum(String name) {
         return EventStatusEnum.valueOf(name);
     }
 
-
     public static EventStatusEnum getDefaultEventStatusEnum() {
         return NOT_STARTED;
     }

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

@@ -4,18 +4,19 @@
  */
 package fi.insomnia.bortal.enums;
 
-import javax.naming.directory.InvalidAttributesException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- *
+ * 
  * @author tuukka
  */
 public enum Permission {
 
     PERMISSION("Description"),
-    LOGIN("User can see loginbutton. (only defaultuser should have permission to that one)");
+    LOGIN("User can see loginbutton. (only defaultuser should have permission to that one)"),
+    userManagement;
+
     private static final Logger logger = LoggerFactory.getLogger(Permission.class);
     private String description;
 
@@ -23,7 +24,7 @@ public enum Permission {
         try {
             return valueOf(name);
         } catch (IllegalArgumentException x) {
-            logger.error("There is no permission named: "+name);
+            logger.error("There is no permission named: " + name);
             throw x;
         }
     }
@@ -32,6 +33,9 @@ public enum Permission {
         this.description = description;
     }
 
+    Permission() {
+    }
+
     /**
      * @return the description
      */

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

@@ -5,7 +5,6 @@
     <properties>
       <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
       <property name="eclipselink.ddl-generation.output-mode" value="both"/>
-      <property name="eclipselink.logging.level" value="ALL"/>
     </properties>
   </persistence-unit>
 </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.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.imageio.ImageIO;
@@ -15,7 +14,6 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
 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.OneToMany;
 import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 
 /**

code/LanBortalWeb/WebContent/index.xhtml

@@ -12,8 +12,13 @@
 			<ui:define name="title">Omnia</ui:define>
 			<ui:define name="header">Header</ui:define>
 			<ui:define name="content">
-				Plop
-		</ui:define>
+				<h:form>
+					<ul>
+					<li><h:commandLink action="generateTestData">Generate test data</h:commandLink></li>
+					<li><h:commandLink action="user/list">List users</h:commandLink></li>
+					</ul>
+				</h:form>
+			</ui:define>
 			<ui:define name="footer">Footer</ui:define>
 		</ui:composition>
 	</h:body>

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

@@ -4,9 +4,7 @@
  */
 package fi.insomnia.bortal.servlet;
 
-import fi.insomnia.bortal.model.Place;
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.ejb.EJB;
 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.RequestScoped;
 
-import fi.insomnia.bortal.beans.EventBeanLocal;
 import fi.insomnia.bortal.beans.TestDataBeanLocal;
 import fi.insomnia.bortal.handler.SessionHandler;
 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.ManagedProperty;
 import javax.faces.bean.SessionScoped;
-import javax.faces.context.FacesContext;
 import javax.faces.model.ListDataModel;
-import javax.servlet.http.HttpSession;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import fi.insomnia.bortal.HostnameFilter;
 import fi.insomnia.bortal.beans.SecurityBeanLocal;
 import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;