Return-Path: Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: (qmail 95753 invoked from network); 12 Aug 2010 17:08:38 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Aug 2010 17:08:38 -0000 Received: (qmail 83379 invoked by uid 500); 12 Aug 2010 17:08:38 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 83345 invoked by uid 500); 12 Aug 2010 17:08:38 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 83337 invoked by uid 99); 12 Aug 2010 17:08:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Aug 2010 17:08:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Aug 2010 17:08:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 51DAE238899C; Thu, 12 Aug 2010 17:07:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r984866 - in /openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans: servlet/WebBeansConfigurationListener.java web/failover/FailOverBagWrapper.java Date: Thu, 12 Aug 2010 17:07:17 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100812170717.51DAE238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: struberg Date: Thu Aug 12 17:07:16 2010 New Revision: 984866 URL: http://svn.apache.org/viewvc?rev=984866&view=rev Log: OWB-385 move servlet listener part to the already used WebBeansConfiguationListener Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java?rev=984866&r1=984865&r2=984866&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java Thu Aug 12 17:07:16 2010 @@ -216,20 +216,26 @@ public class WebBeansConfigurationListen conversationManager.destroyConversationContextWithSessionId(event.getSession().getId()); } - /** - * {@inheritDoc} - */ @Override - public void sessionDidActivate(HttpSessionEvent event) + public void sessionWillPassivate(HttpSessionEvent event) { + if (failoverService != null && + failoverService.isSupportPassivation()) + { + HttpSession session = event.getSession(); + failoverService.sessionWillPassivate(session); + } + } - /** - * {@inheritDoc} - */ @Override - public void sessionWillPassivate(HttpSessionEvent event) + public void sessionDidActivate(HttpSessionEvent event) { + if (failoverService.isSupportFailOver() || + failoverService.isSupportPassivation()) + { + HttpSession session = event.getSession(); + failoverService.restoreBeans(session); + } } - } Modified: openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java?rev=984866&r1=984865&r2=984866&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java (original) +++ openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/failover/FailOverBagWrapper.java Thu Aug 12 17:07:16 2010 @@ -31,8 +31,6 @@ import java.io.ObjectOutput; import java.io.ObjectOutputStream; import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionActivationListener; -import javax.servlet.http.HttpSessionEvent; import org.apache.webbeans.corespi.ServiceLoader; import org.apache.webbeans.logger.WebBeansLogger; @@ -45,8 +43,7 @@ import javassist.util.proxy.ProxyObjectO * Use javassist Proxy streams to serialize and restore failover bean bag. * */ -public class FailOverBagWrapper implements HttpSessionActivationListener, - Serializable, Externalizable +public class FailOverBagWrapper implements Serializable, Externalizable { /**Logger instance*/ private static final WebBeansLogger logger = @@ -185,26 +182,4 @@ public class FailOverBagWrapper implemen } } - @Override - public void sessionWillPassivate(HttpSessionEvent event) - { - if (failoverService != null && - failoverService.isSupportPassivation()) - { - HttpSession session = event.getSession(); - failoverService.sessionWillPassivate(session); - } - - } - - @Override - public void sessionDidActivate(HttpSessionEvent event) - { - if (failoverService.isSupportFailOver() || - failoverService.isSupportPassivation()) - { - HttpSession session = event.getSession(); - failoverService.restoreBeans(session); - } - } }