[webbeans-commits] Webbeans SVN: r1495 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet and 1 other directory.

Thu Feb 12 03:39:47 EST 2009

Author: nickarls
Date: 2009-02-12 03:39:47 -0500 (Thu, 12 Feb 2009)
New Revision: 1495

Modified:
   examples/trunk/numberguess/WebContent/home.xhtml
   examples/trunk/numberguess/WebContent/template.xhtml
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
Log:
WBRI-139, provide session for destruction
Remove Seam taglib references from xhtml:s in numberguess

Modified: examples/trunk/numberguess/WebContent/home.xhtml
===================================================================

--- examples/trunk/numberguess/WebContent/home.xhtml	2009-02-12 06:27:40 UTC (rev 1494)
+++ examples/trunk/numberguess/WebContent/home.xhtml	2009-02-12 08:39:47 UTC (rev 1495)
@@ -2,8 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:ui="http://java.sun.com/jsf/facelets"
     xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:f="http://java.sun.com/jsf/core"
-    xmlns:s="http://jboss.com/products/seam/taglib">
+    xmlns:f="http://java.sun.com/jsf/core">
 
   <ui:composition template="template.xhtml">
     <ui:define name="content">

Modified: examples/trunk/numberguess/WebContent/template.xhtml
===================================================================
--- examples/trunk/numberguess/WebContent/template.xhtml	2009-02-12 06:27:40 UTC (rev 1494)
+++ examples/trunk/numberguess/WebContent/template.xhtml	2009-02-12 08:39:47 UTC (rev 1495)
@@ -1,7 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:ui="http://java.sun.com/jsf/facelets"
-    xmlns:s="http://jboss.com/products/seam/taglib"
     xmlns:h="http://java.sun.com/jsf/html"
     xmlns:f="http://java.sun.com/jsf/core">
 

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java	2009-02-12 06:27:40 UTC (rev 1494)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java	2009-02-12 08:39:47 UTC (rev 1495)
@@ -18,11 +18,13 @@
 package org.jboss.webbeans.servlet;
 
 import javax.context.Conversation;
+import javax.context.SessionScoped;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.context.AbstractBeanMapContext;
 import org.jboss.webbeans.context.ApplicationContext;
 import org.jboss.webbeans.context.ConversationContext;
 import org.jboss.webbeans.context.DependentContext;
@@ -84,6 +86,7 @@
    {
       log.trace("Ending session " + session.getId());
       SessionContext.INSTANCE.setBeanMap(new HttpSessionBeanMap(session));
+      CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).setSession(session);
       ConversationManager conversationManager = CurrentManager.rootManager().getInstanceByType(ConversationManager.class);
       conversationManager.destroyAllConversations();
       SessionContext.INSTANCE.destroy();


