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 14:09:04 UTC
svn commit: r1031548 - in /myfaces/extensions/cdi/trunk:
examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/listener/phase/
jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf...
Author: gpetracek
Date: Fri Nov 5 13:09:03 2010
New Revision: 1031548
URL: http://svn.apache.org/viewvc?rev=1031548&view=rev
Log:
EXTCDI-6 renamed config
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfModuleConfig.java
- copied, changed from r1031543, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java
Removed:
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/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/DefaultWindowContextManager.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.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/WindowContextFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java
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=1031548&r1=1031547&r2=1031548&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 13:09:03 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.examples.codi.jsf12.listener.phase;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import javax.enterprise.inject.Model;
import javax.inject.Inject;
@@ -28,7 +28,7 @@ import javax.inject.Inject;
public class ConfigDemoBean
{
@Inject
- private JsfAwareWindowContextConfig config;
+ private JsfModuleConfig config;
public boolean isInitialRedirectDisable()
{
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=1031548&r1=1031547&r2=1031548&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 13:09:03 2010
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.cdi.jsf.impl.config;
import org.apache.myfaces.extensions.cdi.core.api.config.AbstractAttributeAware;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import javax.enterprise.context.ApplicationScoped;
@@ -29,7 +29,7 @@ import javax.enterprise.context.Applicat
* @author Gerhard Petracek
*/
@ApplicationScoped
-public class DefaultWindowContextConfig extends AbstractAttributeAware implements JsfAwareWindowContextConfig
+public class DefaultWindowContextConfig extends AbstractAttributeAware implements JsfModuleConfig
{
private static final long serialVersionUID = -1065123725125153533L;
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=1031548&r1=1031547&r2=1031548&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 13:09:03 2010
@@ -31,7 +31,7 @@ import org.apache.myfaces.extensions.cdi
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils.*;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ExceptionUtils.windowContextNotEditableException;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContextManager;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextFactory;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextQuotaHandler;
@@ -63,7 +63,7 @@ public class DefaultWindowContextManager
private BeanManager beanManager;
- private JsfAwareWindowContextConfig jsfAwareWindowContextConfig;
+ private JsfModuleConfig jsfModuleConfig;
private boolean allowUnknownWindowIds = false;
@@ -82,16 +82,16 @@ public class DefaultWindowContextManager
//TODO add config + refactor DefaultWindowContextManager
private static final int DEFAULT_WINDOW_KEY_LENGTH = 3;
- protected DefaultWindowContextManager(JsfAwareWindowContextConfig jsfAwareWindowContextConfig,
+ protected DefaultWindowContextManager(JsfModuleConfig jsfModuleConfig,
ProjectStage projectStage,
BeanManager beanManager)
{
- this.jsfAwareWindowContextConfig = jsfAwareWindowContextConfig;
+ this.jsfModuleConfig = jsfModuleConfig;
this.projectStage = projectStage;
this.beanManager = beanManager;
- this.createWindowContextEventEnable = jsfAwareWindowContextConfig.isCreateWindowContextEventEnabled();
- this.closeWindowContextEventEnable = jsfAwareWindowContextConfig.isCloseWindowContextEventEnabled();
+ this.createWindowContextEventEnable = jsfModuleConfig.isCreateWindowContextEventEnabled();
+ this.closeWindowContextEventEnable = jsfModuleConfig.isCloseWindowContextEventEnabled();
init();
}
@@ -100,8 +100,8 @@ public class DefaultWindowContextManager
{
this.windowHandler = getOrCreateScopedInstanceOfBeanByClass(WindowHandler.class);
this.windowContextQuotaHandler = getOrCreateScopedInstanceOfBeanByClass(WindowContextQuotaHandler.class);
- this.allowUnknownWindowIds = this.jsfAwareWindowContextConfig.isUnknownWindowIdsAllowed();
- this.urlParameterSupported = this.jsfAwareWindowContextConfig.isUrlParameterSupported();
+ this.allowUnknownWindowIds = this.jsfModuleConfig.isUnknownWindowIdsAllowed();
+ this.urlParameterSupported = this.jsfModuleConfig.isUrlParameterSupported();
this.projectStageDevelopment = ProjectStage.Development.equals(this.projectStage);
}
@@ -193,11 +193,11 @@ public class DefaultWindowContextManager
if(windowContextFactory != null)
{
- return windowContextFactory.createWindowContext(windowContextId, this.jsfAwareWindowContextConfig);
+ return windowContextFactory.createWindowContext(windowContextId, this.jsfModuleConfig);
}
EditableWindowContext windowContext = new JsfWindowContext(windowContextId,
- this.jsfAwareWindowContextConfig,
+ this.jsfModuleConfig,
this.projectStageDevelopment,
this.beanManager);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.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/DefaultWindowContextQuotaHandler.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextQuotaHandler.java Fri Nov 5 13:09:03 2010
@@ -21,7 +21,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextQuotaHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContextManager;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ExceptionUtils.tooManyOpenWindowException;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
@@ -46,7 +46,7 @@ public class DefaultWindowContextQuotaHa
}
@Inject
- public DefaultWindowContextQuotaHandler(JsfAwareWindowContextConfig config)
+ public DefaultWindowContextQuotaHandler(JsfModuleConfig config)
{
this.maxWindowContextCount = config.getMaxWindowContextCount();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.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/DefaultWindowHandler.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowHandler.java Fri Nov 5 13:09:03 2010
@@ -22,7 +22,7 @@ import static org.apache.myfaces.extensi
.WINDOW_CONTEXT_ID_PARAMETER_KEY;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.RequestCache;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils
.getExistingWindowIdSet;
@@ -57,7 +57,7 @@ public class DefaultWindowHandler implem
}
@Inject
- protected DefaultWindowHandler(JsfAwareWindowContextConfig config)
+ protected DefaultWindowHandler(JsfModuleConfig config)
{
this.useWindowAwareUrlEncoding = config.isUrlParameterSupported();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.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/GroupedConversationContext.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContext.java Fri Nov 5 13:09:03 2010
@@ -30,7 +30,7 @@ import org.apache.myfaces.extensions.cdi
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ExceptionUtils
.windowContextManagerNotEditableException;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContextManager;
import javax.enterprise.inject.spi.Bean;
@@ -110,7 +110,7 @@ class GroupedConversationContext extends
protected ConversationConfig getConversationConfig()
{
- return getOrCreateScopedInstanceOfBeanByClass(JsfAwareWindowContextConfig.class);
+ return getOrCreateScopedInstanceOfBeanByClass(JsfModuleConfig.class);
}
private EditableConversation getConversation(EditableWindowContextManager windowContextManager, Bean<?> bean)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.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/InstanceProducer.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InstanceProducer.java Fri Nov 5 13:09:03 2010
@@ -26,7 +26,7 @@ import static org.apache.myfaces.extensi
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
import org.apache.myfaces.extensions.cdi.core.impl.utils.UnmodifiableMap;
import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByClass;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowContextManagerFactory;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContextManager;
@@ -48,7 +48,7 @@ final class InstanceProducer
@Produces
@SessionScoped
@Named(WINDOW_CONTEXT_MANAGER_BEAN_NAME)
- protected EditableWindowContextManager createWindowContextManager(JsfAwareWindowContextConfig config,
+ protected EditableWindowContextManager createWindowContextManager(JsfModuleConfig config,
ProjectStage projectStage,
BeanManager beanManager)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.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/JsfWindowContext.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java Fri Nov 5 13:09:03 2010
@@ -24,7 +24,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.ConversationKey;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableConversation;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.JsfUtils;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.RequestCache;
@@ -57,7 +57,7 @@ public class JsfWindowContext implements
private final String id;
- private final JsfAwareWindowContextConfig jsfAwareWindowContextConfig;
+ private final JsfModuleConfig jsfModuleConfig;
private final boolean projectStageDevelopment;
private BeanManager beanManager;
@@ -70,17 +70,17 @@ public class JsfWindowContext implements
private final TimeoutExpirationEvaluator expirationEvaluator;
JsfWindowContext(String windowContextId,
- JsfAwareWindowContextConfig jsfAwareWindowContextConfig,
+ JsfModuleConfig jsfModuleConfig,
boolean projectStageDevelopment,
BeanManager beanManager)
{
this.id = windowContextId;
- this.jsfAwareWindowContextConfig = jsfAwareWindowContextConfig;
+ this.jsfModuleConfig = jsfModuleConfig;
this.projectStageDevelopment = projectStageDevelopment;
this.beanManager = beanManager;
this.expirationEvaluator = new TimeoutExpirationEvaluator(
- this.jsfAwareWindowContextConfig.getWindowContextTimeoutInMinutes());
+ this.jsfModuleConfig.getWindowContextTimeoutInMinutes());
}
public String getId()
@@ -210,7 +210,7 @@ public class JsfWindowContext implements
{
((BeanManagerAware)conversationFactory).setBeanManager(this.beanManager);
}
- return conversationFactory.createConversation(conversationKey, this.jsfAwareWindowContextConfig);
+ return conversationFactory.createConversation(conversationKey, this.jsfModuleConfig);
}
public Map<ConversationKey /*conversation group*/, EditableConversation> getConversations()
@@ -220,7 +220,7 @@ public class JsfWindowContext implements
public WindowContextConfig getConfig()
{
- return this.jsfAwareWindowContextConfig;
+ return this.jsfModuleConfig;
}
public boolean isActive()
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.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/RedirectedConversationAwareExternalContext.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Fri Nov 5 13:09:03 2010
@@ -21,7 +21,7 @@ package org.apache.myfaces.extensions.cd
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils.*;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
import javax.faces.context.ExternalContext;
@@ -77,7 +77,7 @@ public class RedirectedConversationAware
{
this.windowHandler = getWindowHandler();
this.encodeActionURLs = CodiUtils
- .getOrCreateScopedInstanceOfBeanByClass(JsfAwareWindowContextConfig.class)
+ .getOrCreateScopedInstanceOfBeanByClass(JsfModuleConfig.class)
.isAddWindowIdToActionUrlsEnabled();
}
}
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=1031548&r1=1031547&r2=1031548&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 13:09:03 2010
@@ -25,7 +25,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils.*;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContextManager;
import static org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager
@@ -47,7 +47,7 @@ final class WindowContextManagerObserver
protected void cleanup(@Observes @AfterPhase(JsfPhaseId.RESTORE_VIEW) PhaseEvent phaseEvent,
RequestTypeResolver requestTypeResolver,
EditableWindowContextManager windowContextManager,
- JsfAwareWindowContextConfig config)
+ JsfModuleConfig config)
{
if (!requestTypeResolver.isPostRequest() && !requestTypeResolver.isPartialRequest())
{
@@ -97,7 +97,7 @@ final class WindowContextManagerObserver
* @param config window config
* @return true if the current request should be continued
*/
- private boolean processGetRequest(FacesContext facesContext, JsfAwareWindowContextConfig config)
+ private boolean processGetRequest(FacesContext facesContext, JsfModuleConfig config)
{
boolean urlParameterSupported = config.isUrlParameterSupported();
boolean useWindowIdForFirstPage = !config.isInitialRedirectDisabled();
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfModuleConfig.java (from r1031543, 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/JsfModuleConfig.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfModuleConfig.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/JsfAwareWindowContextConfig.java&r1=1031543&r2=1031548&rev=1031548&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/JsfModuleConfig.java Fri Nov 5 13:09:03 2010
@@ -25,7 +25,7 @@ import org.apache.myfaces.extensions.cdi
/**
* @author Gerhard Petracek
*/
-public interface JsfAwareWindowContextConfig extends CodiConfig, WindowContextConfig, ConversationConfig
+public interface JsfModuleConfig extends CodiConfig, WindowContextConfig, ConversationConfig
{
boolean isInitialRedirectDisabled();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextFactory.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/WindowContextFactory.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextFactory.java Fri Nov 5 13:09:03 2010
@@ -23,5 +23,5 @@ package org.apache.myfaces.extensions.cd
*/
public interface WindowContextFactory
{
- EditableWindowContext createWindowContext(String windowContextId, JsfAwareWindowContextConfig windowContextConfig);
+ EditableWindowContext createWindowContext(String windowContextId, JsfModuleConfig windowContextConfig);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.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/WindowContextManagerFactory.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.java Fri Nov 5 13:09:03 2010
@@ -23,5 +23,5 @@ package org.apache.myfaces.extensions.cd
*/
public interface WindowContextManagerFactory
{
- EditableWindowContextManager createWindowContextManager(JsfAwareWindowContextConfig windowContextConfig);
+ EditableWindowContextManager createWindowContextManager(JsfModuleConfig windowContextConfig);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/RedirectedConversationAwareExternalContext.java Fri Nov 5 13:09:03 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.extensions.cd
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils.*;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
import javax.faces.context.ExternalContext;
@@ -74,7 +74,7 @@ public class RedirectedConversationAware
{
this.windowHandler = getWindowHandler();
this.encodeActionURLs = CodiUtils
- .getOrCreateScopedInstanceOfBeanByClass(JsfAwareWindowContextConfig.class)
+ .getOrCreateScopedInstanceOfBeanByClass(JsfModuleConfig.class)
.isAddWindowIdToActionUrlsEnabled();
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java?rev=1031548&r1=1031547&r2=1031548&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java Fri Nov 5 13:09:03 2010
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.cdi.jsf2.impl.scope.conversation;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.DefaultWindowHandler;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
+import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfModuleConfig;
import static org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils.tryToLoadClassForName;
import static org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager
@@ -45,7 +45,7 @@ public abstract class ServerSideWindowHa
//workaround for mojarra
private final boolean useFallback;
- protected ServerSideWindowHandler(JsfAwareWindowContextConfig config)
+ protected ServerSideWindowHandler(JsfModuleConfig config)
{
super(config);
this.useFallback = tryToLoadClassForName("org.apache.myfaces.context.FacesContextFactoryImpl") == null;