hostnamefiltterin pathtrackeriä

code/LanBortalWeb/WebContent/actionlog/messagelist.xhtml

@@ -46,7 +46,7 @@
 			<div id="actionlog">
 				<h:form id="refresh">
 					<p:poll interval="1" update="actionlogtable" />
-					<p:dataTable2styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,50,100">
+					<p:dataTable styleClass="bordertable" id="actionlogtable" value="#{actionLogMessageView.messages}" var="message" paginator="true" rows="30" paginatorTemplate="{CurrentPageReport}  {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" rowsPerPageTemplate="10,20,30,50,100" >
 						<p:column>
 							<f:facet name="header">
 								<h:outputText value="#{i18n['actionlog.time']}" />

code/LanBortalWeb/src/fi/insomnia/bortal/HostnameFilter.java

 package fi.insomnia.bortal;
 
 import java.io.IOException;
-import java.util.LinkedList;
-import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.ejb.EJB;
-import javax.enterprise.context.SessionScoped;
 import javax.faces.context.FacesContext;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -33,6 +31,7 @@ public class HostnameFilter implements Filter {
 
 	@EJB
 	private SessionMgmtBeanLocal sessionmgmt;
+	private static final String HTTP_TRAIL_NAME = "lanbortal_http_trail";
 
 	/**
 	 * Default constructor.
@@ -48,11 +47,11 @@ public class HostnameFilter implements Filter {
 	public void destroy() {
 		// Nothing...
 	}
-	@SessionScoped
-	Queue<String> trail = new LinkedList<String>();
+
 	/**
 	 * @see Filter#doFilter(ServletRequest, ServletResponse, FilterChain)
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
@@ -117,12 +116,22 @@ public class HostnameFilter implements Filter {
 			{
 				sessionmgmt.updateSessionUser(httpRequest.getSession().getId(), httpRequest.getUserPrincipal().getName());
 			}
-			while (trail.size() >= 10) {
-				trail.remove();
+
+			Object trailO = httpRequest.getSession().getAttribute(HTTP_TRAIL_NAME);
+			ConcurrentLinkedQueue<Object> trail = null;
+			if (trailO != null && trailO instanceof ConcurrentLinkedQueue)
+			{
+				trail = (ConcurrentLinkedQueue<Object>) trailO;
+			} else {
+				trail = new ConcurrentLinkedQueue<Object>();
+				httpRequest.getSession().setAttribute(HTTP_TRAIL_NAME, trail);
+			}
+			for (int remove = trail.size() - 10; remove > 0; --remove) {
+				Object removed = trail.poll();
+				logger.debug("Removed {} from http trail", removed);
 			}
 			if (!httpRequest.getRequestURI().matches(".*(resource).*")) {
 				trail.add(httpRequest.getRequestURI());
-				httpRequest.getSession().setAttribute("trail", trail);
 			}
 
 		}

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_en.properties

@@ -195,6 +195,8 @@ foodWave.time              = Time
 foodWave.totalReserved     = Total
 foodWave.unconfirmedOrders = Unconfirmed
 
+foodadmin.editTemplate = Edit
+
 foodshop.buyFromCounter  = Pay at info
 foodshop.buyFromInternet = Pay at Internet
 
@@ -607,6 +609,9 @@ submenu.auth.sendResetMail           = Password reset
 submenu.bill.billSummary             = Bill summary
 submenu.bill.list                    = My bills
 submenu.bill.listAll                 = All bills
+submenu.foodadmin.createTemplate     = Create Foodwavetemplate
+submenu.foodadmin.listTemplates      = Foodwave templates
+submenu.foodmanager.listFoodwaves    = List foodwaves
 submenu.foodwave.list                = Open foodwaves
 submenu.foodwave.listTemplates       = Food provides
 submenu.index                        = Frontpage

code/LanBortalWeb/src/fi/insomnia/bortal/resources/i18n_fi.properties

@@ -193,6 +193,8 @@ foodWave.time              = Aika
 foodWave.totalReserved     = Yhteens\u00E4
 foodWave.unconfirmedOrders = Vahvistamattomia
 
+foodadmin.editTemplate = Muokkaa
+
 foodshop.buyFromCounter  = Maksa infossa
 foodshop.buyFromInternet = Maksa Internetiss\u00E4
 
@@ -587,6 +589,9 @@ submenu.auth.sendResetMail           = Salasanan palautus
 submenu.bill.billSummary             = Laskujen yhteenveto
 submenu.bill.list                    = N\u00E4yt\u00E4 omat laskut
 submenu.bill.listAll                 = Kaikki laskut
+submenu.foodadmin.createTemplate     = Luo ruokatilauspohja
+submenu.foodadmin.listTemplates      = Ruokatilauspohjat
+submenu.foodmanager.listFoodwaves    = Ruokatilaukset
 submenu.foodwave.list                = Avoimet tilaukset
 submenu.index                        = Etusivu
 submenu.map.create                   = Uusi kartta