svn commit: r984457 - in /myfaces/extensions/cdi/trunk: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ jee-modules/jsf-module...

[gp...@apache.org]

Author: gpetracek
Date: Wed Aug 11 15:59:31 2010
New Revision: 984457

URL: http://svn.apache.org/viewvc?rev=984457&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 cleanup + ScopeBeanEvent

Added:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ScopeBeanEvent.java
Removed:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/BeanNotFoundException.java
Modified:
    myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationBeanEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java

Added: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ScopeBeanEvent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ScopeBeanEvent.java?rev=984457&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ScopeBeanEvent.java (added)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ScopeBeanEvent.java Wed Aug 11 15:59:31 2010
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.core.api.scope.conversation;
+
+import java.io.Serializable;
+
+/**
+ * @author Gerhard Petracek
+ */
+public final class ScopeBeanEvent extends ConversationEvent
+{
+    public ScopeBeanEvent(Serializable bean)
+    {
+        super(bean);
+    }
+}
\ No newline at end of file

Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationBeanEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationBeanEntry.java?rev=984457&r1=984456&r2=984457&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationBeanEntry.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationBeanEntry.java Wed Aug 11 15:59:31 2010
@@ -20,9 +20,12 @@ package org.apache.myfaces.extensions.cd
 
 import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.BeanEntry;
 import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.createNewInstanceOfBean;
+import org.apache.myfaces.extensions.cdi.core.api.manager.BeanManagerProvider;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ScopeBeanEvent;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
+import java.io.Serializable;
 
 /**
  * @author Gerhard Petracek
@@ -41,7 +44,7 @@ class ConversationBeanEntry<T> implement
     {
         this.bean = bean;
         this.creationalContext = creationalContext;
-        this.currentBeanInstance = createNewInstanceOfBean(bean, creationalContext);
+        createNewBeanInstance();
     }
 
     public Bean<T> getBean()
@@ -58,7 +61,8 @@ class ConversationBeanEntry<T> implement
     {
         if (this.currentBeanInstance == null)
         {
-            this.currentBeanInstance = createNewInstanceOfBean(this.creationalContext, this.bean);
+            //in case of a reset
+            createNewBeanInstance();
         }
         return this.currentBeanInstance;
     }
@@ -71,4 +75,14 @@ class ConversationBeanEntry<T> implement
 
         return oldBeanInstance;
     }
+
+    private void createNewBeanInstance()
+    {
+        this.currentBeanInstance = createNewInstanceOfBean(this.bean, this.creationalContext);
+
+        //we don't have to check the implementation of Serializable - cdi already checked it
+
+        BeanManagerProvider.getInstance().getBeanManager()
+                .fireEvent(new ScopeBeanEvent((Serializable)this.currentBeanInstance));
+    }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java?rev=984457&r1=984456&r2=984457&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/BeanStorage.java Wed Aug 11 15:59:31 2010
@@ -46,11 +46,9 @@ class BeanStorage implements Serializabl
 
     public BeanEntry addBean(BeanEntry<Serializable> beanEntry)
     {
-        //BeanEntryHolder newBean = new BeanEntryHolder(beanHolder);
         Class beanClass = beanEntry.getBean().getBeanClass();
         this.beanMap.remove(beanClass);
         this.beanMap.put(beanClass, beanEntry);
-        //this.beanAccessedEventEvent.fire(new BeanAccessedEvent(bean.getBeanInstance()));
         return beanEntry;
     }