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 07:16:04 UTC
svn commit: r1031447 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/resolver/
examples/jsf-examples/hello_myfaces-codi_...
Author: gpetracek
Date: Fri Nov 5 06:16:03 2010
New Revision: 1031447
URL: http://svn.apache.org/viewvc?rev=1031447&view=rev
Log:
EXTCDI-6 removed ConfigResolver
Removed:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/resolver/ConfigResolver.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/resolver/DefaultConfigResolver.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/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.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/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/util/ConversationUtils.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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -18,42 +18,20 @@
*/
package org.apache.myfaces.examples.codi.jsf12.listener.phase;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
-import org.apache.myfaces.extensions.cdi.jsf.impl.config.DefaultWindowContextConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
import javax.enterprise.inject.Model;
-import javax.enterprise.inject.Typed;
import javax.inject.Inject;
//just an internal demo
@Model
-@Typed(ConfigDemoBean.class)
-public class ConfigDemoBean extends DefaultWindowContextConfig
+public class ConfigDemoBean
{
- private static final long serialVersionUID = -6915243682321970384L;
-
@Inject
- private ConfigResolver configResolver;
-
- public ConfigDemoBean()
- {
- }
-
- @Inject
- public ConfigDemoBean(ConfigResolver configResolver)
- {
- this.configResolver = configResolver;
-
- if(this.configResolver.resolve(JsfAwareWindowContextConfig.class) == null)
- {
- throw new IllegalStateException("invalid config");
- }
- }
+ private JsfAwareWindowContextConfig config;
- @Override
public boolean isInitialRedirectDisable()
{
- return this.configResolver.resolve(JsfAwareWindowContextConfig.class).isInitialRedirectDisable();
+ return this.config.isInitialRedirectDisable();
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.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/request/AbstractRequestTypeResolver.java?rev=1031447&r1=1031446&r2=1031447&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.java Fri Nov 5 06:16:03 2010
@@ -18,10 +18,6 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.api.request;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
-
-import javax.inject.Inject;
-
/**
* Base implementation which adds the possibility to provide a custom implementation.
*
@@ -29,10 +25,6 @@ import javax.inject.Inject;
*/
public abstract class AbstractRequestTypeResolver implements RequestTypeResolver
{
- @Inject
- @SuppressWarnings({"UnusedDeclaration"})
- private ConfigResolver configResolver;
-
private RequestTypeResolver defaultRequestTypeResolver;
public boolean isPartialRequest()
@@ -49,23 +41,10 @@ public abstract class AbstractRequestTyp
private RequestTypeResolver getCurrentRequestTypeResolver()
{
- RequestTypeResolver requestTypeResolver = getCustomRequestTypeResolver();
-
- if (requestTypeResolver != null)
- {
- return requestTypeResolver;
- }
-
if (this.defaultRequestTypeResolver == null)
{
this.defaultRequestTypeResolver = createDefaultRequestTypeResolver();
}
return this.defaultRequestTypeResolver;
}
-
- private RequestTypeResolver getCustomRequestTypeResolver()
- {
- //TODO use the config resolver to get the custom RequestTypeResolver
- return null;
- }
}
\ No newline at end of file
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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -25,7 +25,6 @@ import org.apache.myfaces.extensions.cdi
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;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
@@ -47,10 +46,9 @@ public class DefaultWindowContextQuotaHa
}
@Inject
- public DefaultWindowContextQuotaHandler(ConfigResolver configResolver)
+ public DefaultWindowContextQuotaHandler(JsfAwareWindowContextConfig config)
{
- this.maxWindowContextCount = configResolver.resolve(JsfAwareWindowContextConfig.class)
- .getMaxWindowContextCount();
+ this.maxWindowContextCount = config.getMaxWindowContextCount();
}
public boolean checkQuota(int activeWindowContextCount)
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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.extensions.cd
import static org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager
.WINDOW_CONTEXT_ID_PARAMETER_KEY;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
@@ -58,10 +57,9 @@ public class DefaultWindowHandler implem
}
@Inject
- protected DefaultWindowHandler(ConfigResolver configResolver)
+ protected DefaultWindowHandler(JsfAwareWindowContextConfig config)
{
- this.useWindowAwareUrlEncoding = configResolver.resolve(JsfAwareWindowContextConfig.class)
- .isUrlParameterSupported();
+ this.useWindowAwareUrlEncoding = config.isUrlParameterSupported();
}
public String encodeURL(String url)
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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -19,7 +19,6 @@
package org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationConfig;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.AbstractGroupedConversationContext;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableConversation;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
@@ -111,8 +110,7 @@ class GroupedConversationContext extends
protected ConversationConfig getConversationConfig()
{
- return getOrCreateScopedInstanceOfBeanByClass(this.beanManager,ConfigResolver.class)
- .resolve(JsfAwareWindowContextConfig.class);
+ return getOrCreateScopedInstanceOfBeanByClass(JsfAwareWindowContextConfig.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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.Conversation;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStage;
import static org.apache.myfaces.extensions.cdi.core.api.CoreModuleBeanNames.*;
import static org.apache.myfaces.extensions.cdi.core.impl.CoreModuleBeanNames.*;
@@ -49,21 +48,18 @@ final class InstanceProducer
@Produces
@SessionScoped
@Named(WINDOW_CONTEXT_MANAGER_BEAN_NAME)
- protected EditableWindowContextManager createWindowContextManager(ConfigResolver configResolver,
+ protected EditableWindowContextManager createWindowContextManager(JsfAwareWindowContextConfig config,
ProjectStage projectStage,
BeanManager beanManager)
{
- JsfAwareWindowContextConfig jsfAwareWindowContextConfig =
- configResolver.resolve(JsfAwareWindowContextConfig.class);
-
WindowContextManagerFactory windowContextManagerFactory =
getOrCreateScopedInstanceOfBeanByClass(beanManager, WindowContextManagerFactory.class, true);
if(windowContextManagerFactory != null)
{
- return windowContextManagerFactory.createWindowContextManager(jsfAwareWindowContextConfig);
+ return windowContextManagerFactory.createWindowContextManager(config);
}
- return new DefaultWindowContextManager(jsfAwareWindowContextConfig, projectStage, beanManager);
+ return new DefaultWindowContextManager(config, projectStage, beanManager);
}
protected void destroyAllConversations(
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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -23,7 +23,6 @@ import static org.apache.myfaces.extensi
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.core.impl.utils.CodiUtils;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import javax.faces.context.ExternalContext;
import java.io.IOException;
@@ -78,8 +77,8 @@ public class RedirectedConversationAware
{
this.windowHandler = getWindowHandler();
this.encodeActionURLs = CodiUtils
- .getOrCreateScopedInstanceOfBeanByClass(ConfigResolver.class)
- .resolve(JsfAwareWindowContextConfig.class).isAddWindowIdToActionUrlsEnabled();
+ .getOrCreateScopedInstanceOfBeanByClass(JsfAwareWindowContextConfig.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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -31,7 +31,6 @@ import org.apache.myfaces.extensions.cdi
import static org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager
.WINDOW_CONTEXT_ID_PARAMETER_KEY;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableConversation;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import javax.enterprise.event.Observes;
import javax.faces.event.PhaseEvent;
@@ -48,13 +47,12 @@ final class WindowContextManagerObserver
protected void cleanup(@Observes @AfterPhase(JsfPhaseId.RESTORE_VIEW) PhaseEvent phaseEvent,
RequestTypeResolver requestTypeResolver,
EditableWindowContextManager windowContextManager,
- ConfigResolver configResolver)
+ JsfAwareWindowContextConfig config)
{
if (!requestTypeResolver.isPostRequest() && !requestTypeResolver.isPartialRequest())
{
//don't use the config of the current window context - it would trigger a touch
- boolean continueRequest = processGetRequest(
- phaseEvent.getFacesContext(), configResolver.resolve(JsfAwareWindowContextConfig.class));
+ boolean continueRequest = processGetRequest(phaseEvent.getFacesContext(), config);
if (!continueRequest)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.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/util/ConversationUtils.java?rev=1031447&r1=1031446&r2=1031447&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/ConversationUtils.java Fri Nov 5 06:16:03 2010
@@ -18,17 +18,13 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.util;
-import static org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider.getInstance;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationScoped;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
-import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByClass;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.WindowContextIdHolderComponent;
-import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.JsfAwareWindowContextConfig;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.WindowHandler;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContextManager;
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.spi.EditableWindowContext;
@@ -335,17 +331,6 @@ public class ConversationUtils
externalContext.getRequestMap().put(REDIRECT_PERFORMED_KEY, Boolean.TRUE);
}
- public static JsfAwareWindowContextConfig getJsfAwareWindowContextConfig()
- {
- Set<Bean<?>> configResolvers = getInstance().getBeanManager().getBeans(ConfigResolver.class);
-
- //TODO
- ConfigResolver configResolver = (ConfigResolver) CodiUtils
- .getOrCreateScopedInstanceOfBean(configResolvers.iterator().next());
-
- return configResolver.resolve(JsfAwareWindowContextConfig.class);
- }
-
public static WindowHandler getWindowHandler()
{
return getOrCreateScopedInstanceOfBeanByClass(WindowHandler.class);
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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -22,7 +22,6 @@ import static org.apache.myfaces.extensi
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.core.impl.utils.CodiUtils;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import javax.faces.context.ExternalContext;
import javax.faces.context.ExternalContextWrapper;
@@ -75,8 +74,8 @@ public class RedirectedConversationAware
{
this.windowHandler = getWindowHandler();
this.encodeActionURLs = CodiUtils
- .getOrCreateScopedInstanceOfBeanByClass(ConfigResolver.class)
- .resolve(JsfAwareWindowContextConfig.class).isAddWindowIdToActionUrlsEnabled();
+ .getOrCreateScopedInstanceOfBeanByClass(JsfAwareWindowContextConfig.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=1031447&r1=1031446&r2=1031447&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 06:16:03 2010
@@ -19,9 +19,9 @@
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 static org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils.tryToLoadClassForName;
-import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import static org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager
.WINDOW_CONTEXT_ID_PARAMETER_KEY;
@@ -45,9 +45,9 @@ public abstract class ServerSideWindowHa
//workaround for mojarra
private final boolean useFallback;
- protected ServerSideWindowHandler(ConfigResolver configResolver)
+ protected ServerSideWindowHandler(JsfAwareWindowContextConfig config)
{
- super(configResolver);
+ super(config);
this.useFallback = tryToLoadClassForName("org.apache.myfaces.context.FacesContextFactoryImpl") == null;
}