svn commit: r1538528 - in /tomee/tomee/trunk: examples/spring-data-proxy-meta/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java server/openejb-http/src/main/java/org/apache/openejb/server/httpd/EndWebBeansListener.java

[rm...@apache.org]

Author: rmannibucau
Date: Mon Nov  4 08:44:14 2013
New Revision: 1538528

URL: http://svn.apache.org/r1538528
Log:
removing OWB deprecated calls + a little cleanup in spring-data-proxy-meta

Modified:
    tomee/tomee/trunk/examples/spring-data-proxy-meta/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java
    tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/EndWebBeansListener.java

Modified: tomee/tomee/trunk/examples/spring-data-proxy-meta/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/spring-data-proxy-meta/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java?rev=1538528&r1=1538527&r2=1538528&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/spring-data-proxy-meta/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java (original)
+++ tomee/tomee/trunk/examples/spring-data-proxy-meta/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java Mon Nov  4 08:44:14 2013
@@ -59,7 +59,6 @@ public class DynamicUserDaoTest {
         p.setProperty("openejb.exclude-include.order", "exclude-include");
 
         p.setProperty("jdbc/DynamicUserDaoTest", "new://Resource?type=DataSource");
-        p.setProperty("jdbc/DynamicUserDaoTest", "new://Resource?type=DataSource");
         p.setProperty("jdbc/DynamicUserDaoTest.JdbcDriver", "org.hsqldb.jdbcDriver");
         p.setProperty("jdbc/DynamicUserDaoTest.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
         p.setProperty("jdbc/DynamicUserDaoTest.UserName", "sa");

Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/EndWebBeansListener.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/EndWebBeansListener.java?rev=1538528&r1=1538527&r2=1538528&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/EndWebBeansListener.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/EndWebBeansListener.java Mon Nov  4 08:44:14 2013
@@ -21,10 +21,12 @@ import org.apache.openejb.cdi.WebappWebB
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
 import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.context.ConversationContext;
 import org.apache.webbeans.conversation.ConversationManager;
 import org.apache.webbeans.el.ELContextStore;
 import org.apache.webbeans.spi.FailOverService;
 
+import javax.enterprise.context.Conversation;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
 import javax.servlet.ServletRequestEvent;
@@ -33,8 +35,7 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpSessionActivationListener;
 import javax.servlet.http.HttpSessionEvent;
 import javax.servlet.http.HttpSessionListener;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Map;
 
 /**
  * @version $Rev$ $Date$
@@ -152,8 +153,13 @@ public class EndWebBeansListener impleme
             WebappWebBeansContext.class.cast(webBeansContext).getParent().getContextsService().endContext(SessionScoped.class, event.getSession());
         }
 
-        ConversationManager conversationManager = webBeansContext.getConversationManager();
-        conversationManager.destroyConversationContextWithSessionId(event.getSession().getId());
+        final ConversationManager conversationManager = webBeansContext.getConversationManager();
+        final Map<Conversation, ConversationContext> cc = conversationManager.getAndRemoveConversationMapWithSessionId(event.getSession().getId());
+        for (final ConversationContext c : cc.values()) {
+            if (c != null) {
+                c.destroy();
+            }
+        }
     }