ActionLogMessage stuff, still needs access checks :)

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

 package fi.insomnia.bortal.beans;
 
+import java.util.List;
+
+import javax.ejb.EJB;
 import javax.ejb.Stateless;
 
+import fi.insomnia.bortal.facade.ActionLogFacade;
+import fi.insomnia.bortal.model.ActionLogMessage;
+
 /**
  * Session Bean implementation class ActionLogBean
  * eventin
@@ -11,10 +17,11 @@ import javax.ejb.Stateless;
  */
 @Stateless
 public class ActionLogBean implements ActionLogBeanLocal {
+	// TODO: Permissions
+	
+	@EJB
+	private ActionLogFacade actionLogFacade;
 
-    /**
-     * Default constructor. 
-     */
     public ActionLogBean() {
         // TODO Auto-generated constructor stub
     }
@@ -24,6 +31,7 @@ public class ActionLogBean implements ActionLogBeanLocal {
     
     }
     
-    
-
+    public List<ActionLogMessage> getAllActionLogEvents() {
+    	return actionLogFacade.getAllSortedByTimestamp();
+    }
 }

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

 package fi.insomnia.bortal.beans;
+import java.util.List;
+
 import javax.ejb.Local;
 
+import fi.insomnia.bortal.model.ActionLogMessage;
+
 @Local
 public interface ActionLogBeanLocal {
-
+    public List<ActionLogMessage> getAllActionLogEvents();
 }

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

@@ -4,11 +4,15 @@ import java.util.Date;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
+import fi.insomnia.bortal.enums.ActionLogMessageState;
+
 @Entity
 @Table(name="actionlog_messages")
 public class ActionLogMessage extends GenericEntity {
@@ -18,6 +22,7 @@ public class ActionLogMessage extends GenericEntity {
     @Temporal(TemporalType.TIMESTAMP)
     private Date time = new Date();
     
+    
     @JoinColumn(name="user_id")
     private User user;
     
@@ -28,7 +33,8 @@ public class ActionLogMessage extends GenericEntity {
     private String message;
     
     @Column(name="state", nullable=true)
-    private Integer state;
+    @Enumerated(EnumType.STRING)
+    private ActionLogMessageState state;
 
     public Date getTime() {
         return time;
@@ -62,11 +68,11 @@ public class ActionLogMessage extends GenericEntity {
         this.message = message;
     }
 
-    public Integer getState() {
+    public ActionLogMessageState getState() {
         return state;
     }
 
-    public void setState(Integer state) {
+    public void setState(ActionLogMessageState state) {
         this.state = state;
     }
 

code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml

@@ -15,15 +15,15 @@
 			<h:dataTable styleClass="bordertable" id="message" value="#{actionLogMessageView.messages}" var="message">
 				<h:column>
 					<f:facet name="header">
-						<h:outputText value="#{i18n['actionlog.timestamp']}" />
+						<h:outputText value="#{i18n['actionlog.time']}" />
 					</f:facet>
-					<h:outputText value="#{message.timestamp}" />
+					<h:outputText value="#{message.time}" />
 				</h:column>
 				<h:column>
 					<f:facet name="header">
 						<h:outputText value="#{i18n['actionlog.user']}" />
 					</f:facet>
-					<h:outputText value="#{message.user}" />
+					<h:outputText value="#{message.user.nick}" />
 				</h:column>
 				<h:column>
 					<f:facet name="header">

code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/actionlog/ActionLogMessageView.java

 package fi.insomnia.bortal.web.cdiview.actionlog;
 
-import java.util.ArrayList;
+import java.util.List;
 
+import javax.ejb.EJB;
 import javax.faces.bean.RequestScoped;
 import javax.inject.Named;
 
-import fi.insomnia.bortal.web.cdiview.actionlog.ActionMessage;
+import fi.insomnia.bortal.beans.ActionLogBeanLocal;
+import fi.insomnia.bortal.model.ActionLogMessage;
 import fi.insomnia.bortal.web.cdiview.GenericCDIView;
 
 @Named
 @RequestScoped
 public class ActionLogMessageView extends GenericCDIView {
 	private static final long serialVersionUID = 1L;
-	ArrayList<ActionMessage> messages = null;
 	
-	public ArrayList<ActionMessage> getMessages() {
-		if(messages == null) {
-			messages = new ArrayList<ActionMessage>();
-			ActionMessage test = new ActionMessage();
-			test.setTimestamp("test123");
-			test.setUser("homo");
-			test.setCrew("oijdsaofdsa");
-			test.setMessage("pupu on siella");
-			messages.add(test);
-			messages.add(test);
-			messages.add(test);
-			messages.add(test);
-		}
-		return messages;
+	@EJB
+	ActionLogBeanLocal actionLogBean;
+	
+	public List<ActionLogMessage> getMessages() {
+		return actionLogBean.getAllActionLogEvents();
 	}
 }