You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/11/05 13:33:07 UTC
svn commit: r1031539 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/
core/impl/src/main/java/org/apache/...
Author: gpetracek
Date: Fri Nov 5 12:33:06 2010
New Revision: 1031539
URL: http://svn.apache.org/viewvc?rev=1031539&view=rev
Log:
EXTCDI-6 extracting config via web.xml (to an add-on)
Removed:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/CoreCodiConfigParameter.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/BooleanConfigValueParser.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/ConfigValueParser.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/IntegerConfigValueParser.java
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/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContextConfig.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/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/listener/phase/ConfigDemoBean.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.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=1031539&r1=1031538&r2=1031539&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 Fri Nov 5 12:33:06 2010
@@ -21,8 +21,6 @@ package org.apache.myfaces.extensions.cd
import java.io.Serializable;
/**
- * TODO check if we should implement CodiConfig
- *
* @author Gerhard Petracek
*/
public interface ConversationConfig extends Serializable
@@ -39,15 +37,15 @@ public interface ConversationConfig exte
* event config
*/
- boolean isScopeBeanEventEnable();
+ boolean isScopeBeanEventEnabled();
- boolean isAccessBeanEventEnable();
+ boolean isAccessBeanEventEnabled();
- boolean isUnscopeBeanEventEnable();
+ boolean isUnscopeBeanEventEnabled();
- boolean isStartConversationEventEnable();
+ boolean isStartConversationEventEnabled();
- boolean isCloseConversationEventEnable();
+ boolean isCloseConversationEventEnabled();
- boolean isRestartConversationEventEnable();
+ boolean isRestartConversationEventEnabled();
}
\ No newline at end of file
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContextConfig.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/WindowContextConfig.java?rev=1031539&r1=1031538&r2=1031539&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/WindowContextConfig.java Fri Nov 5 12:33:06 2010
@@ -63,9 +63,9 @@ public interface WindowContextConfig ext
* event config
*/
- boolean isCreateWindowContextEventEnable();
+ boolean isCreateWindowContextEventEnabled();
- boolean isCloseWindowContextEventEnable();
+ boolean isCloseWindowContextEventEnabled();
//boolean isResetWindowContextEventEnable();
}
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=1031539&r1=1031538&r2=1031539&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 Fri Nov 5 12:33:06 2010
@@ -145,9 +145,9 @@ public abstract class AbstractGroupedCon
{
this.conversationConfig = getConversationConfig();
- this.scopeBeanEventEnable = this.conversationConfig.isScopeBeanEventEnable();
- this.accessBeanEventEnable = this.conversationConfig.isAccessBeanEventEnable();
- this.unscopeBeanEventEnable = this.conversationConfig.isUnscopeBeanEventEnable();
+ this.scopeBeanEventEnable = this.conversationConfig.isScopeBeanEventEnabled();
+ this.accessBeanEventEnable = this.conversationConfig.isAccessBeanEventEnabled();
+ this.unscopeBeanEventEnable = this.conversationConfig.isUnscopeBeanEventEnabled();
}
}
}
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/listener/phase/ConfigDemoBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/listener/phase/ConfigDemoBean.java?rev=1031539&r1=1031538&r2=1031539&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/listener/phase/ConfigDemoBean.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/listener/phase/ConfigDemoBean.java Fri Nov 5 12:33:06 2010
@@ -32,6 +32,6 @@ public class ConfigDemoBean
public boolean isInitialRedirectDisable()
{
- return this.config.isInitialRedirectDisable();
+ return this.config.isInitialRedirectDisabled();
}
}
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=1031539&r1=1031538&r2=1031539&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 Fri Nov 5 12:33:06 2010
@@ -18,46 +18,14 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.config;
-import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
import org.apache.myfaces.extensions.cdi.core.api.config.AbstractAttributeAware;
-import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
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;
/**
+ * customizable via a bean annotated and configured as {@link javax.enterprise.inject.Alternative}
+ *
* @author Gerhard Petracek
*/
@ApplicationScoped
@@ -65,268 +33,78 @@ public class DefaultWindowContextConfig
{
private static final long serialVersionUID = -1065123725125153533L;
- private Boolean configInitialized;
-
public boolean isUrlParameterSupported()
{
- lazyInit();
- return getAttribute(URL_PARAMETER_ENABLED, Boolean.class);
+ return true;
}
public boolean isUnknownWindowIdsAllowed()
{
- lazyInit();
- return getAttribute(ALLOW_UNKNOWN_WINDOW_IDS, Boolean.class);
+ return false;
}
public boolean isAddWindowIdToActionUrlsEnabled()
{
- lazyInit();
- return getAttribute(ADD_WINDOW_ID_TO_ACTION_URL_ENABLED, Boolean.class);
+ return false;
}
public int getWindowContextTimeoutInMinutes()
{
- lazyInit();
- return getAttribute(WINDOW_CONTEXT_TIMEOUT, Integer.class);
+ return 60;
}
public int getConversationTimeoutInMinutes()
{
- lazyInit();
- return getAttribute(CONVERSATION_TIMEOUT, Integer.class);
+ return 30;
}
- public boolean isScopeBeanEventEnable()
+ public boolean isScopeBeanEventEnabled()
{
- lazyInit();
- return getAttribute(ENABLE_SCOPE_BEAN_EVENT, Boolean.class);
+ return false;
}
- public boolean isAccessBeanEventEnable()
+ public boolean isAccessBeanEventEnabled()
{
- lazyInit();
- return getAttribute(ENABLE_ACCESS_BEAN_EVENT, Boolean.class);
+ return false;
}
- public boolean isUnscopeBeanEventEnable()
+ public boolean isUnscopeBeanEventEnabled()
{
- lazyInit();
- return getAttribute(ENABLE_UNSCOPE_BEAN_EVENT, Boolean.class);
+ return false;
}
- public boolean isStartConversationEventEnable()
+ public boolean isStartConversationEventEnabled()
{
- lazyInit();
- return getAttribute(ENABLE_START_CONVERSATION_EVENT, Boolean.class);
+ return false;
}
- public boolean isCloseConversationEventEnable()
+ public boolean isCloseConversationEventEnabled()
{
- lazyInit();
- return getAttribute(ENABLE_CLOSE_CONVERSATION_EVENT, Boolean.class);
+ return false;
}
- public boolean isRestartConversationEventEnable()
+ public boolean isRestartConversationEventEnabled()
{
- lazyInit();
- return getAttribute(ENABLE_RESTART_CONVERSATION_EVENT, Boolean.class);
+ return false;
}
public int getMaxWindowContextCount()
{
- lazyInit();
- return getAttribute(MAX_WINDOW_CONTEXT_COUNT, Integer.class);
- }
-
- public boolean isCreateWindowContextEventEnable()
- {
- lazyInit();
- return getAttribute(ENABLE_CREATE_WINDOW_CONTEXT_EVENT, Boolean.class);
- }
-
- public boolean isCloseWindowContextEventEnable()
- {
- lazyInit();
- return getAttribute(ENABLE_CLOSE_WINDOW_CONTEXT_EVENT, Boolean.class);
- }
-
- public boolean isInitialRedirectDisable()
- {
- lazyInit();
- return getAttribute(DISABLE_INITIAL_REDIRECT, Boolean.class);
+ return 64;
}
- private void lazyInit()
+ public boolean isCreateWindowContextEventEnabled()
{
- if (configInitialized == null)
- {
- init(FacesContext.getCurrentInstance(), CodiUtils.getCurrentProjectStage());
- }
+ return false;
}
- private synchronized void init(FacesContext facesContext, ProjectStage currentProjectStage)
+ public boolean isCloseWindowContextEventEnabled()
{
- if (configInitialized != null || facesContext == null)
- {
- return;
- }
-
- configInitialized = true;
-
- initUrlParameterEnabled(facesContext);
- initAllowUnknownWindowIds(facesContext);
- initMaxWindowContextCount(facesContext, ProjectStage.SystemTest.equals(currentProjectStage));
- initWindowContextTimeout(facesContext);
- initConversationTimeout(facesContext);
- initDisableInitialRedirect(facesContext);
- initConversatonEvents(facesContext);
- initActionUrlEncoding(facesContext);
+ return false;
}
- private void initUrlParameterEnabled(FacesContext facesContext)
+ public boolean isInitialRedirectDisabled()
{
- initConfig(facesContext, URL_PARAMETER_ENABLED, new BooleanConfigValueParser(), URL_PARAMETER_ENABLED_DEFAULT);
- }
-
- private void initAllowUnknownWindowIds(FacesContext facesContext)
- {
- initConfig(facesContext,
- ALLOW_UNKNOWN_WINDOW_IDS, new BooleanConfigValueParser(), ALLOW_UNKNOWN_WINDOW_IDS_DEFAULT);
- }
-
- private void initMaxWindowContextCount(FacesContext facesContext, boolean inProjectStageSystemTest)
- {
- int defaultMaxCount = MAX_WINDOW_CONTEXT_COUNT_DEFAULT;
-
- if(inProjectStageSystemTest)
- {
- defaultMaxCount = Integer.MAX_VALUE;
- }
-
- initConfig(facesContext, MAX_WINDOW_CONTEXT_COUNT, new IntegerConfigValueParser(), defaultMaxCount);
- }
-
- private void initWindowContextTimeout(FacesContext facesContext)
- {
- initConfig(facesContext,
- WINDOW_CONTEXT_TIMEOUT, new IntegerConfigValueParser(), WINDOW_CONTEXT_TIMEOUT_DEFAULT);
- }
-
- private void initConversationTimeout(FacesContext facesContext)
- {
- initConfig(facesContext, CONVERSATION_TIMEOUT, new IntegerConfigValueParser(), CONVERSATION_TIMEOUT_DEFAULT);
- }
-
- private void initDisableInitialRedirect(FacesContext facesContext)
- {
- initConfig(facesContext,
- DISABLE_INITIAL_REDIRECT, new BooleanConfigValueParser(), DISABLE_INITIAL_REDIRECT_DEFAULT);
- }
-
- private void initConversatonEvents(FacesContext facesContext)
- {
- initScopeBeanEvent(facesContext);
- initAccessBeanEvent(facesContext);
- initUnscopeBeanEvent(facesContext);
-
- initStartConversationEvent(facesContext);
- initCloseConversationEvent(facesContext);
- initRestartConversationEvent(facesContext);
-
- initCreateWindowContextEvent(facesContext);
- initCloseWindowContextEvent(facesContext);
- }
-
- private void initStartConversationEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_START_CONVERSATION_EVENT, new BooleanConfigValueParser(),
- ENABLE_START_CONVERSATION_EVENT_DEFAULT);
- }
-
- private void initCloseConversationEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_CLOSE_CONVERSATION_EVENT, new BooleanConfigValueParser(),
- ENABLE_CLOSE_CONVERSATION_EVENT_DEFAULT);
- }
-
- private void initRestartConversationEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_RESTART_CONVERSATION_EVENT, new BooleanConfigValueParser(),
- ENABLE_RESTART_CONVERSATION_EVENT_DEFAULT);
- }
-
- private void initCreateWindowContextEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_CREATE_WINDOW_CONTEXT_EVENT, new BooleanConfigValueParser(),
- ENABLE_CREATE_WINDOW_CONTEXT_EVENT_DEFAULT);
- }
-
- private void initCloseWindowContextEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_CLOSE_WINDOW_CONTEXT_EVENT, new BooleanConfigValueParser(),
- ENABLE_CLOSE_WINDOW_CONTEXT_EVENT_DEFAULT);
- }
-
- private void initScopeBeanEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_SCOPE_BEAN_EVENT, new BooleanConfigValueParser(), ENABLE_SCOPE_BEAN_EVENT_DEFAULT);
- }
-
- private void initAccessBeanEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_ACCESS_BEAN_EVENT, new BooleanConfigValueParser(), ENABLE_ACCESS_BEAN_EVENT_DEFAULT);
- }
-
- private void initUnscopeBeanEvent(FacesContext facesContext)
- {
- initConfig(facesContext,
- ENABLE_UNSCOPE_BEAN_EVENT, new BooleanConfigValueParser(), ENABLE_UNSCOPE_BEAN_EVENT_DEFAULT);
- }
-
- private void initActionUrlEncoding(FacesContext facesContext)
- {
- initConfig(facesContext,
- ADD_WINDOW_ID_TO_ACTION_URL_ENABLED,
- new BooleanConfigValueParser(),
- ADD_WINDOW_ID_TO_ACTION_URL_ENABLED_DEFAULT);
- }
-
- protected <T> void initConfig(FacesContext facesContext,
- String configKey,
- ConfigValueParser<T> configValueParser,
- T defaultValue)
- {
- String customValue = facesContext.getExternalContext().getInitParameter(configKey);
-
- if (customValue == null)
- {
- setAttribute(configKey, defaultValue);
- return;
- }
-
- customValue = customValue.trim();
-
- if ("".equals(customValue))
- {
- setAttribute(configKey, defaultValue);
- return;
- }
-
- if(configValueParser == null)
- {
- setAttribute(configKey, customValue);
- }
- else
- {
- setAttribute(configKey, configValueParser.parse(customValue));
- }
+ return true;
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/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/jsf/impl/scope/conversation/DefaultConversation.java?rev=1031539&r1=1031538&r2=1031539&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultConversation.java Fri Nov 5 12:33:06 2010
@@ -59,8 +59,8 @@ public class DefaultConversation impleme
this.beanManager = beanManager;
this.beanStorage = new BeanStorage(this.beanManager);
- this.closeConversationEventEnable = conversationConfig.isCloseConversationEventEnable();
- this.restartConversationEventEnable = conversationConfig.isRestartConversationEventEnable();
+ this.closeConversationEventEnable = conversationConfig.isCloseConversationEventEnabled();
+ this.restartConversationEventEnable = conversationConfig.isRestartConversationEventEnabled();
}
//just for a better performance to avoid frequent calls to the {@link #expirationEvaluator}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.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/scope/conversation/DefaultWindowContextManager.java?rev=1031539&r1=1031538&r2=1031539&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.java Fri Nov 5 12:33:06 2010
@@ -90,8 +90,8 @@ public class DefaultWindowContextManager
this.projectStage = projectStage;
this.beanManager = beanManager;
- this.createWindowContextEventEnable = jsfAwareWindowContextConfig.isCreateWindowContextEventEnable();
- this.closeWindowContextEventEnable = jsfAwareWindowContextConfig.isCloseWindowContextEventEnable();
+ this.createWindowContextEventEnable = jsfAwareWindowContextConfig.isCreateWindowContextEventEnabled();
+ this.closeWindowContextEventEnable = jsfAwareWindowContextConfig.isCloseWindowContextEventEnabled();
init();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.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/scope/conversation/JsfAwareConversationFactory.java?rev=1031539&r1=1031538&r2=1031539&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java Fri Nov 5 12:33:06 2010
@@ -67,7 +67,7 @@ public class JsfAwareConversationFactory
configuration,
this.beanManager);
- return processCreatedConversation(conversation, configuration.isStartConversationEventEnable());
+ return processCreatedConversation(conversation, configuration.isStartConversationEventEnabled());
}
if(ViewAccessScoped.class.isAssignableFrom(conversationKey.getScope()))
@@ -77,7 +77,7 @@ public class JsfAwareConversationFactory
configuration,
this.beanManager);
- return processCreatedConversation(conversation, configuration.isStartConversationEventEnable());
+ return processCreatedConversation(conversation, configuration.isStartConversationEventEnabled());
}
conversation = new DefaultConversation(conversationKey,
@@ -86,7 +86,7 @@ public class JsfAwareConversationFactory
configuration,
this.beanManager);
- return processCreatedConversation(conversation, configuration.isStartConversationEventEnable());
+ return processCreatedConversation(conversation, configuration.isStartConversationEventEnabled());
}
private EditableConversation processCreatedConversation(EditableConversation conversation,
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.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/scope/conversation/WindowContextManagerObserver.java?rev=1031539&r1=1031538&r2=1031539&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextManagerObserver.java Fri Nov 5 12:33:06 2010
@@ -100,7 +100,7 @@ final class WindowContextManagerObserver
private boolean processGetRequest(FacesContext facesContext, JsfAwareWindowContextConfig config)
{
boolean urlParameterSupported = config.isUrlParameterSupported();
- boolean useWindowIdForFirstPage = !config.isInitialRedirectDisable();
+ boolean useWindowIdForFirstPage = !config.isInitialRedirectDisabled();
if(!urlParameterSupported)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.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/scope/conversation/spi/JsfAwareWindowContextConfig.java?rev=1031539&r1=1031538&r2=1031539&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java Fri Nov 5 12:33:06 2010
@@ -27,5 +27,5 @@ import org.apache.myfaces.extensions.cdi
*/
public interface JsfAwareWindowContextConfig extends CodiConfig, WindowContextConfig, ConversationConfig
{
- boolean isInitialRedirectDisable();
+ boolean isInitialRedirectDisabled();
}