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

[gp...@apache.org]

Author: gpetracek
Date: Mon Jul 12 14:40:41 2010
New Revision: 963292

URL: http://svn.apache.org/viewvc?rev=963292&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 minor changes and added javadoc

Modified:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/Conversation.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/ConfigParameter.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/Conversation.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/Conversation.java?rev=963292&r1=963291&r2=963292&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/Conversation.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/Conversation.java Mon Jul 12 14:40:41 2010
@@ -21,6 +21,8 @@ package org.apache.myfaces.extensions.cd
 import java.io.Serializable;
 
 /**
+ * The central interface for a conversation which is a container for 1-n beans
+ * (which share the same time for destruction).
  * A conversation is started automatically with the first access
  *
  * @author Gerhard Petracek

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.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/WindowContext.java?rev=963292&r1=963291&r2=963292&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContext.java Mon Jul 12 14:40:41 2010
@@ -38,6 +38,10 @@ public interface WindowContext extends A
     /**
      * TODO add: endContext to reset the window scope
      * invalidate all conversations immediately
+     * attention: window scoped beans won't get destroyed.
+     * currently there is no api for it.
+     * (if it is needed you have to call {@link #endConversation} in combination with the
+     * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowGroup})
      */
     void endConversations();
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/ConfigParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/ConfigParameter.java?rev=963292&r1=963291&r2=963292&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/ConfigParameter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/ConfigParameter.java Mon Jul 12 14:40:41 2010
@@ -38,10 +38,10 @@ public interface ConfigParameter
     static final String GROUPED_CONVERSATION_TIMEOUT =
             CoreCodiConfigParameter.BASE_NAME + "GROUPED_CONVERSATION_TIMEOUT";
 
-    static final int GROUPED_CONVERSATION_TIMEOUT_DEFAULT = 2;
+    static final int GROUPED_CONVERSATION_TIMEOUT_DEFAULT = 30;
 
     static final String WINDOW_CONTEXT_TIMEOUT =
             CoreCodiConfigParameter.BASE_NAME + "WINDOW_CONTEXT_TIMEOUT";
 
-    static final int WINDOW_CONTEXT_TIMEOUT_DEFAULT = 2;
+    static final int WINDOW_CONTEXT_TIMEOUT_DEFAULT = 60;
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.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/DefaultConversation.java?rev=963292&r1=963291&r2=963292&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/DefaultConversation.java Mon Jul 12 14:40:41 2010
@@ -79,8 +79,11 @@ public class DefaultConversation impleme
 
     public void end()
     {
-        this.active = false;
-        this.beanStorage.resetStorage();
+        if(this.active)
+        {
+            this.active = false;
+            this.beanStorage.resetStorage();
+        }
     }
 
     public void restart()