From commits-return-7289-archive-asf-public=cust-asf.ponee.io@openwebbeans.apache.org Fri Apr 13 21:50:04 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id DCC7B180627 for ; Fri, 13 Apr 2018 21:50:03 +0200 (CEST) Received: (qmail 92255 invoked by uid 500); 13 Apr 2018 19:50:03 -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 92244 invoked by uid 99); 13 Apr 2018 19:50:03 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Apr 2018 19:50:03 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 1BB023A00E7 for ; Fri, 13 Apr 2018 19:50:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1829097 - in /openwebbeans/trunk: ./ webbeans-impl/src/main/java/org/apache/webbeans/context/ webbeans-impl/src/main/java/org/apache/webbeans/conversation/ Date: Fri, 13 Apr 2018 19:50:00 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180413195002.1BB023A00E7@svn01-us-west.apache.org> Author: struberg Date: Fri Apr 13 19:50:00 2018 New Revision: 1829097 URL: http://svn.apache.org/viewvc?rev=1829097&view=rev Log: update to MyFaces-2.3.0 which is EE8 level Modified: openwebbeans/trunk/pom.xml openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java Modified: openwebbeans/trunk/pom.xml URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1829097&r1=1829096&r2=1829097&view=diff ============================================================================== --- openwebbeans/trunk/pom.xml (original) +++ openwebbeans/trunk/pom.xml Fri Apr 13 19:50:00 2018 @@ -70,7 +70,7 @@ 1.0 1.1 7.0.73 - 2.2.12 + 2.3.0 4.7 1.1.13.Final 2.0.3.Final Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1829097&r1=1829096&r2=1829097&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Fri Apr 13 19:50:00 2018 @@ -274,6 +274,7 @@ public abstract class AbstractContext im throws IOException { s.writeObject(scopeType); + s.writeBoolean(active); // we need to repack the Contextual from the componentInstanceMap into Serializable ones if (componentInstanceMap != null) @@ -305,6 +306,7 @@ public abstract class AbstractContext im throws IOException, ClassNotFoundException { scopeType = (Class) s.readObject(); + active = s.readBoolean(); HashMap, BeanInstanceBag> serializableInstanceMap = (HashMap, BeanInstanceBag>) s.readObject(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java?rev=1829097&r1=1829096&r2=1829097&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java Fri Apr 13 19:50:00 2018 @@ -18,6 +18,9 @@ */ package org.apache.webbeans.context; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import java.util.concurrent.ConcurrentHashMap; import javax.enterprise.context.ConversationScoped; @@ -63,4 +66,18 @@ public class ConversationContext extends return conversation; } + + @Override + public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException + { + this.conversation = (ConversationImpl) in.readObject(); + super.readExternal(in); + } + + @Override + public void writeExternal(ObjectOutput out) throws IOException + { + out.writeObject(conversation); + super.writeExternal(out); + } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1829097&r1=1829096&r2=1829097&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Fri Apr 13 19:50:00 2018 @@ -70,9 +70,10 @@ public class ConversationImpl implements private transient RuntimeException problemDuringCreation; /** - * This instance is under used and by which threads, Atomicinteger would be great but then contract of ContextsService but be enhanced to + * This instance is in use and by which threads. + * Atomicinteger would be great but then contract of ContextsService would need to be enhanced to * be compatible wih WBPhaseListeners. Using thread allow to call iUseIt() multiple times. - * String to be serializable. + * Long to be serializable. * TODO: serialization should be done manually to use the manager otherwise all is broken */ private transient Set threadsUsingIt = new HashSet<>(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1829097&r1=1829096&r2=1829097&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java Fri Apr 13 19:50:00 2018 @@ -36,6 +36,7 @@ import org.apache.webbeans.annotation.De import org.apache.webbeans.annotation.DestroyedLiteral; import org.apache.webbeans.config.OWBLogConst; import org.apache.webbeans.config.WebBeansContext; +import org.apache.webbeans.container.BeanManagerImpl; import org.apache.webbeans.context.ConversationContext; import org.apache.webbeans.context.RequestContext; import org.apache.webbeans.context.creational.CreationalContextImpl; @@ -57,7 +58,7 @@ public class ConversationManager private final WebBeansContext webBeansContext; - private final ConversationStorageBean conversationStorageBean; + private final Bean> conversationStorageBean; /** * Creates new conversation manager @@ -66,8 +67,15 @@ public class ConversationManager { this.webBeansContext = webBeansContext; - conversationStorageBean = new ConversationStorageBean(webBeansContext); - webBeansContext.getBeanManagerImpl().addInternalBean(conversationStorageBean); + // We cannot use this directly since it will change after passivation + ConversationStorageBean convBean = new ConversationStorageBean(webBeansContext); + + BeanManagerImpl bm = webBeansContext.getBeanManagerImpl(); + bm.addInternalBean(convBean); + + // this will returned the internally wrapped ThirdPartyBean. + conversationStorageBean = (Bean>) + bm.resolve(bm.getBeans(ConversationStorageBean.OWB_INTERNAL_CONVERSATION_STORAGE_BEAN_PASSIVATION_ID)); } @@ -100,6 +108,7 @@ public class ConversationManager conversationContext.getConversation().setProblemDuringCreation(problem); } + conversationContext.setActive(true); return conversationContext; } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java?rev=1829097&r1=1829096&r2=1829097&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationStorageBean.java Fri Apr 13 19:50:00 2018 @@ -28,7 +28,6 @@ import java.io.Serializable; import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collections; -import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -41,7 +40,7 @@ import org.apache.webbeans.context.Conve */ public class ConversationStorageBean implements Bean>, PassivationCapable, Serializable { - private static final String OWB_INTERNAL_CONVERSATION_STORAGE_BEAN_PASSIVATION_ID = "OwbInternalConversationStorageBean"; + public static final String OWB_INTERNAL_CONVERSATION_STORAGE_BEAN_PASSIVATION_ID = "apache.openwebbeans.OwbInternalConversationStorageBean"; private final transient WebBeansContext webBeansContext; public ConversationStorageBean() @@ -84,7 +83,7 @@ public class ConversationStorageBean imp @Override public Class getBeanClass() { - return Map.class; + return Set.class; } @Override @@ -114,7 +113,7 @@ public class ConversationStorageBean imp @Override public String getName() { - return null; + return OWB_INTERNAL_CONVERSATION_STORAGE_BEAN_PASSIVATION_ID; } @Override @@ -157,4 +156,6 @@ public class ConversationStorageBean imp { return getId().hashCode(); } + + }