You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/10/11 23:47:37 UTC
svn commit: r1021523 - 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/
core/impl/src/main/ja...
Author: jakobk
Date: Mon Oct 11 21:47:36 2010
New Revision: 1021523
URL: http://svn.apache.org/viewvc?rev=1021523&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 further event renaming
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationConfig.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/ConversationBeanEntry.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationConfig.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/ConversationConfig.java?rev=1021523&r1=1021522&r2=1021523&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationConfig.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationConfig.java Mon Oct 11 21:47:36 2010
@@ -29,7 +29,7 @@ public interface ConversationConfig exte
boolean isScopeBeanEventEnable();
- boolean isBeanAccessEventEnable();
+ boolean isAccessBeanEventEnable();
boolean isUnscopeBeanEventEnable();
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.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/AbstractGroupedConversationContext.java?rev=1021523&r1=1021522&r2=1021523&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/AbstractGroupedConversationContext.java Mon Oct 11 21:47:36 2010
@@ -19,12 +19,12 @@
package org.apache.myfaces.extensions.cdi.core.impl.scope.conversation;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationConfig;
-import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.BeanEntry;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.Bean;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
/**
* @author Gerhard Petracek
@@ -37,7 +37,7 @@ public abstract class AbstractGroupedCon
private boolean scopeBeanEventEnable = false;
- private boolean beanAccessEventEnable = false;
+ private boolean accessBeanEventEnable = false;
private boolean unscopeBeanEventEnable = false;
@@ -82,7 +82,7 @@ public abstract class AbstractGroupedCon
WindowContextManager windowContextManager = resolveWindowContextManager();
BeanEntry<T> beanEntry = new ConversationBeanEntry<T>(creationalContext, bean, this.beanManager,
- this.scopeBeanEventEnable, this.beanAccessEventEnable, this.unscopeBeanEventEnable);
+ this.scopeBeanEventEnable, this.accessBeanEventEnable, this.unscopeBeanEventEnable);
scopeBeanEntry(windowContextManager, beanEntry);
@@ -136,7 +136,7 @@ public abstract class AbstractGroupedCon
this.conversationConfig = getConversationConfig();
this.scopeBeanEventEnable = this.conversationConfig.isScopeBeanEventEnable();
- this.beanAccessEventEnable = this.conversationConfig.isBeanAccessEventEnable();
+ this.accessBeanEventEnable = this.conversationConfig.isAccessBeanEventEnable();
this.unscopeBeanEventEnable = this.conversationConfig.isUnscopeBeanEventEnable();
}
}
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=1021523&r1=1021522&r2=1021523&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 Mon Oct 11 21:47:36 2010
@@ -18,16 +18,17 @@
*/
package org.apache.myfaces.extensions.cdi.core.impl.scope.conversation;
-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.scope.conversation.event.ScopeBeanEvent;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.AccessBeanEvent;
+import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.ScopeBeanEvent;
+import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.BeanEntry;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import java.io.Serializable;
+import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.createNewInstanceOfBean;
+
/**
* @author Gerhard Petracek
*/
@@ -45,7 +46,7 @@ class ConversationBeanEntry<T> implement
private final boolean scopeBeanEventEnable;
- private final boolean beanAccessEventEnable;
+ private final boolean accessBeanEventEnable;
private final boolean unscopeBeanEventEnable;
@@ -53,7 +54,7 @@ class ConversationBeanEntry<T> implement
Bean<T> bean,
BeanManager beanManager,
boolean scopeBeanEventEnable,
- boolean beanAccessEventEnable,
+ boolean accessBeanEventEnable,
boolean unscopeBeanEventEnable)
{
this.bean = bean;
@@ -61,7 +62,7 @@ class ConversationBeanEntry<T> implement
this.beanManager = beanManager;
this.scopeBeanEventEnable = scopeBeanEventEnable;
- this.beanAccessEventEnable = beanAccessEventEnable;
+ this.accessBeanEventEnable = accessBeanEventEnable;
this.unscopeBeanEventEnable = unscopeBeanEventEnable;
}
@@ -83,7 +84,7 @@ class ConversationBeanEntry<T> implement
createNewBeanInstance();
}
- if(this.beanAccessEventEnable)
+ if(this.accessBeanEventEnable)
{
//we don't have to check the implementation of Serializable - cdi already checked it
this.beanManager.fireEvent(new AccessBeanEvent((Serializable)this.currentBeanInstance));
@@ -106,9 +107,9 @@ class ConversationBeanEntry<T> implement
return this.scopeBeanEventEnable;
}
- public boolean isBeanAccessEventEnabled()
+ public boolean isAccessBeanEventEnabled()
{
- return this.beanAccessEventEnable;
+ return this.accessBeanEventEnable;
}
public boolean isUnscopeBeanEventEnabled()
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.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/spi/BeanEntry.java?rev=1021523&r1=1021522&r2=1021523&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/spi/BeanEntry.java Mon Oct 11 21:47:36 2010
@@ -18,8 +18,8 @@
*/
package org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi;
-import javax.enterprise.inject.spi.Bean;
import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
import java.io.Serializable;
/**
@@ -40,7 +40,7 @@ public interface BeanEntry<T> extends Se
boolean isScopeBeanEventEnabled();
- boolean isBeanAccessEventEnabled();
+ boolean isAccessBeanEventEnabled();
boolean isUnscopeBeanEventEnabled();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/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/jsf/api/ConfigParameter.java?rev=1021523&r1=1021522&r2=1021523&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java Mon Oct 11 21:47:36 2010
@@ -70,10 +70,10 @@ public interface ConfigParameter
static final boolean ENABLE_SCOPE_BEAN_EVENT_DEFAULT = false;
- static final String ENABLE_BEAN_ACCESS_EVENT =
- CoreCodiConfigParameter.BASE_NAME + "ENABLE_BEAN_ACCESS_EVENT";
+ static final String ENABLE_ACCESS_BEAN_EVENT =
+ CoreCodiConfigParameter.BASE_NAME + "ENABLE_ACCESS_BEAN_EVENT";
- static final boolean ENABLE_BEAN_ACCESS_EVENT_DEFAULT = false;
+ static final boolean ENABLE_ACCESS_BEAN_EVENT_DEFAULT = false;
static final String ENABLE_UNSCOPE_BEAN_EVENT =
CoreCodiConfigParameter.BASE_NAME + "ENABLE_UNSCOPE_BEAN_EVENT";
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java?rev=1021523&r1=1021522&r2=1021523&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java Mon Oct 11 21:47:36 2010
@@ -20,20 +20,50 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
-import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.*;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.DefaultWindowContextQuotaHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.DefaultWindowHandler;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.JsfAwareConversationFactory;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.ConversationFactory;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextFactory;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextManagerFactory;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.ConversationFactory;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextQuotaHandler;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.JsfAwareConversationFactory;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.DefaultWindowContextQuotaHandler;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
import javax.enterprise.context.ApplicationScoped;
import javax.faces.context.FacesContext;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ADD_WINDOW_ID_TO_ACTION_URL_ENABLED;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ADD_WINDOW_ID_TO_ACTION_URL_ENABLED_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ALLOW_UNKNOWN_WINDOW_IDS;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ALLOW_UNKNOWN_WINDOW_IDS_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.CONVERSATION_TIMEOUT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.CONVERSATION_TIMEOUT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.DISABLE_INITIAL_REDIRECT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.DISABLE_INITIAL_REDIRECT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_ACCESS_BEAN_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_ACCESS_BEAN_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_CLOSE_CONVERSATION_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_CLOSE_CONVERSATION_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_CLOSE_WINDOW_CONTEXT_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_CLOSE_WINDOW_CONTEXT_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_CREATE_WINDOW_CONTEXT_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_CREATE_WINDOW_CONTEXT_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_RESTART_CONVERSATION_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_RESTART_CONVERSATION_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_SCOPE_BEAN_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_SCOPE_BEAN_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_START_CONVERSATION_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_START_CONVERSATION_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_UNSCOPE_BEAN_EVENT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.ENABLE_UNSCOPE_BEAN_EVENT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.MAX_WINDOW_CONTEXT_COUNT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.MAX_WINDOW_CONTEXT_COUNT_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.URL_PARAMETER_ENABLED;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.URL_PARAMETER_ENABLED_DEFAULT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.WINDOW_CONTEXT_TIMEOUT;
+import static org.apache.myfaces.extensions.cdi.jsf.api.ConfigParameter.WINDOW_CONTEXT_TIMEOUT_DEFAULT;
+
/**
* @author Gerhard Petracek
*/
@@ -80,10 +110,10 @@ public class DefaultWindowContextConfig
return getAttribute(ENABLE_SCOPE_BEAN_EVENT, Boolean.class);
}
- public boolean isBeanAccessEventEnable()
+ public boolean isAccessBeanEventEnable()
{
lazyInit();
- return getAttribute(ENABLE_BEAN_ACCESS_EVENT, Boolean.class);
+ return getAttribute(ENABLE_ACCESS_BEAN_EVENT, Boolean.class);
}
public boolean isUnscopeBeanEventEnable()
@@ -241,7 +271,7 @@ public class DefaultWindowContextConfig
private void initConversatonEvents(FacesContext facesContext)
{
initScopeBeanEvent(facesContext);
- initBeanAccessEvent(facesContext);
+ initAccessBeanEvent(facesContext);
initUnscopeBeanEvent(facesContext);
initStartConversationEvent(facesContext);
@@ -293,10 +323,10 @@ public class DefaultWindowContextConfig
ENABLE_SCOPE_BEAN_EVENT, new BooleanConfigValueParser(), ENABLE_SCOPE_BEAN_EVENT_DEFAULT);
}
- private void initBeanAccessEvent(FacesContext facesContext)
+ private void initAccessBeanEvent(FacesContext facesContext)
{
initConfig(facesContext,
- ENABLE_BEAN_ACCESS_EVENT, new BooleanConfigValueParser(), ENABLE_BEAN_ACCESS_EVENT_DEFAULT);
+ ENABLE_ACCESS_BEAN_EVENT, new BooleanConfigValueParser(), ENABLE_ACCESS_BEAN_EVENT_DEFAULT);
}
private void initUnscopeBeanEvent(FacesContext facesContext)
@@ -389,4 +419,4 @@ public class DefaultWindowContextConfig
setAttribute(configKey, configValueParser.parse(customValue));
}
}
-}
\ No newline at end of file
+}