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/09/30 14:53:33 UTC
svn commit: r1003047 - in /myfaces/extensions/cdi/trunk:
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/
core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/scope/conversation/
core/impl/src/main/java/org/apa...
Author: gpetracek
Date: Thu Sep 30 12:53:33 2010
New Revision: 1003047
URL: http://svn.apache.org/viewvc?rev=1003047&view=rev
Log:
cleanup and performance improvements
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCacheStore.java
Modified:
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.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/utils/CodiUtils.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/SecurityUtils.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.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/GroupedConversationContext.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/security/SecurityInterceptor.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.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/listener/system/CodiJsf2SystemEventListener.java
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/config/ConfigProducer.java Thu Sep 30 12:53:33 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.CodiConfig;
import org.apache.myfaces.extensions.cdi.core.api.config.DeactivatedCodiConfig;
-import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
import org.apache.myfaces.extensions.cdi.core.api.resolver.ConfigResolver;
import org.apache.myfaces.extensions.cdi.core.impl.utils.ApplicationCache;
@@ -29,6 +28,7 @@ import javax.enterprise.inject.spi.BeanM
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
import java.util.Set;
import java.util.HashSet;
import java.util.Collections;
@@ -46,6 +46,9 @@ public class ConfigProducer
private static Set<Class<? extends CodiConfig>> configFilter;
+ @Inject
+ private BeanManager beanManager;
+
@Produces
@ApplicationScoped
public Set<CodiConfig> createCodiConfig()
@@ -64,11 +67,9 @@ public class ConfigProducer
return; //paranoid mode
}
- BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
-
- createConfigFilter(beanManager);
+ createConfigFilter();
- createConfig(beanManager);
+ createConfig();
configInitialized = true;
}
@@ -116,9 +117,9 @@ public class ConfigProducer
};
}
- private void createConfigFilter(BeanManager beanManager)
+ private void createConfigFilter()
{
- Set<? extends Bean> deactivatedConfigBeans = beanManager.getBeans(DeactivatedCodiConfig.class);
+ Set<? extends Bean> deactivatedConfigBeans = this.beanManager.getBeans(DeactivatedCodiConfig.class);
configFilter = new HashSet<Class<? extends CodiConfig>>(deactivatedConfigBeans.size());
@@ -126,7 +127,7 @@ public class ConfigProducer
Class<? extends CodiConfig>[] filteredCodiConfigClasses;
for(Bean<DeactivatedCodiConfig> deactivatedConfigBean : deactivatedConfigBeans)
{
- creationalContext = beanManager.createCreationalContext(deactivatedConfigBean);
+ creationalContext = this.beanManager.createCreationalContext(deactivatedConfigBean);
filteredCodiConfigClasses = deactivatedConfigBean.create(creationalContext).getDeactivatedConfigs();
@@ -134,9 +135,9 @@ public class ConfigProducer
}
}
- private void createConfig(BeanManager beanManager)
+ private void createConfig()
{
- Set<? extends Bean> configBeans = beanManager.getBeans(CodiConfig.class);
+ Set<? extends Bean> configBeans = this.beanManager.getBeans(CodiConfig.class);
configSet = new HashSet<CodiConfig>(configBeans.size());
@@ -144,7 +145,7 @@ public class ConfigProducer
CodiConfig currentCodiConfig;
for(Bean<CodiConfig> codiConfigBean : configBeans)
{
- creationalContext = beanManager.createCreationalContext(codiConfigBean);
+ creationalContext = this.beanManager.createCreationalContext(codiConfigBean);
currentCodiConfig = codiConfigBean.create(creationalContext);
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=1003047&r1=1003046&r2=1003047&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 Thu Sep 30 12:53:33 2010
@@ -81,7 +81,7 @@ public abstract class AbstractGroupedCon
WindowContextManager windowContextManager = resolveWindowContextManager();
- BeanEntry<T> beanEntry = new ConversationBeanEntry<T>(creationalContext, bean,
+ BeanEntry<T> beanEntry = new ConversationBeanEntry<T>(creationalContext, bean, this.beanManager,
this.scopeBeanEventEnable, this.beanAccessEventEnable, this.unscopeBeanEventEnable);
scopeBeanEntry(windowContextManager, beanEntry);
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=1003047&r1=1003046&r2=1003047&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 Thu Sep 30 12:53:33 2010
@@ -20,7 +20,6 @@ package org.apache.myfaces.extensions.cd
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.provider.BeanManagerProvider;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.ScopeBeanEvent;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.BeanAccessEvent;
@@ -42,6 +41,8 @@ class ConversationBeanEntry<T> implement
private CreationalContext<T> creationalContext;
+ private BeanManager beanManager;
+
private final boolean scopeBeanEventEnable;
private final boolean beanAccessEventEnable;
@@ -50,12 +51,14 @@ class ConversationBeanEntry<T> implement
ConversationBeanEntry(CreationalContext<T> creationalContext,
Bean<T> bean,
+ BeanManager beanManager,
boolean scopeBeanEventEnable,
boolean beanAccessEventEnable,
boolean unscopeBeanEventEnable)
{
this.bean = bean;
this.creationalContext = creationalContext;
+ this.beanManager = beanManager;
this.scopeBeanEventEnable = scopeBeanEventEnable;
this.beanAccessEventEnable = beanAccessEventEnable;
@@ -83,7 +86,7 @@ class ConversationBeanEntry<T> implement
if(this.beanAccessEventEnable)
{
//we don't have to check the implementation of Serializable - cdi already checked it
- getBeanManager().fireEvent(new BeanAccessEvent((Serializable)this.currentBeanInstance));
+ this.beanManager.fireEvent(new BeanAccessEvent((Serializable)this.currentBeanInstance));
}
return this.currentBeanInstance;
@@ -125,15 +128,10 @@ class ConversationBeanEntry<T> implement
if(this.scopeBeanEventEnable)
{
//we don't have to check the implementation of Serializable - cdi already checked it
- getBeanManager().fireEvent(new ScopeBeanEvent((Serializable)this.currentBeanInstance));
+ this.beanManager.fireEvent(new ScopeBeanEvent((Serializable)this.currentBeanInstance));
}
}
- private BeanManager getBeanManager()
- {
- return BeanManagerProvider.getInstance().getBeanManager();
- }
-
@Override
public String toString()
{
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/CodiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/CodiUtils.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/CodiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/CodiUtils.java Thu Sep 30 12:53:33 2010
@@ -62,9 +62,10 @@ public class CodiUtils
return bean.create(creationalContext);
}
- public static <T> T getOrCreateScopedInstanceOfBeanByName(String beanName, Class<T> targetClass)
+ public static <T> T getOrCreateScopedInstanceOfBeanByName(
+ BeanManager beanManager, String beanName, Class<T> targetClass)
{
- Set<Bean<?>> foundBeans = BeanManagerProvider.getInstance().getBeanManager().getBeans(beanName);
+ Set<Bean<?>> foundBeans = beanManager.getBeans(beanName);
if(foundBeans.size() != 1)
{
@@ -72,19 +73,32 @@ public class CodiUtils
}
//noinspection unchecked
- return (T)getOrCreateScopedInstanceOfBean(foundBeans.iterator().next());
+ return (T)getOrCreateScopedInstanceOfBean(beanManager, foundBeans.iterator().next());
}
public static <T> T getOrCreateScopedInstanceOfBeanByClass(Class<T> targetClass, Annotation... qualifier)
{
- return getOrCreateScopedInstanceOfBeanByClass(targetClass, false, qualifier);
+ return getOrCreateScopedInstanceOfBeanByClass(BeanManagerProvider.getInstance().getBeanManager(),
+ targetClass, qualifier);
+ }
+
+ public static <T> T getOrCreateScopedInstanceOfBeanByClass(
+ BeanManager beanManager, Class<T> targetClass, Annotation... qualifier)
+ {
+ return getOrCreateScopedInstanceOfBeanByClass(beanManager, targetClass, false, qualifier);
}
public static <T> T getOrCreateScopedInstanceOfBeanByClass(
Class<T> targetClass, boolean optionalBeanAllowed, Annotation... qualifier)
{
- Set<? extends Bean> foundBeans = BeanManagerProvider.getInstance().getBeanManager()
- .getBeans(targetClass, qualifier);
+ return getOrCreateScopedInstanceOfBeanByClass(BeanManagerProvider.getInstance().getBeanManager(),
+ targetClass, optionalBeanAllowed, qualifier);
+ }
+
+ public static <T> T getOrCreateScopedInstanceOfBeanByClass(
+ BeanManager beanManager, Class<T> targetClass, boolean optionalBeanAllowed, Annotation... qualifier)
+ {
+ Set<? extends Bean> foundBeans = beanManager.getBeans(targetClass, qualifier);
if(foundBeans.size() > 1)
{
@@ -101,7 +115,7 @@ public class CodiUtils
if(foundBeans.size() == 1)
{
//noinspection unchecked
- return (T)getOrCreateScopedInstanceOfBean(foundBeans.iterator().next());
+ return (T)getOrCreateScopedInstanceOfBean(beanManager, foundBeans.iterator().next());
}
if(!optionalBeanAllowed)
@@ -113,7 +127,11 @@ public class CodiUtils
public static <T> T getOrCreateScopedInstanceOfBean(Bean<T> bean)
{
- BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
+ return getOrCreateScopedInstanceOfBean(BeanManagerProvider.getInstance().getBeanManager(), bean);
+ }
+
+ public static <T> T getOrCreateScopedInstanceOfBean(BeanManager beanManager, Bean<T> bean)
+ {
Context context = beanManager.getContext(bean.getScope());
T result = context.get(bean);
@@ -213,8 +231,8 @@ public class CodiUtils
}
BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
-
- T foundBean = (T)getOrCreateScopedInstanceOfBeanByClass(instance.getClass(), true);
+
+ T foundBean = (T)getOrCreateScopedInstanceOfBeanByClass(beanManager, instance.getClass(), true);
if(foundBean != null)
{
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/SecurityUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/SecurityUtils.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/SecurityUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/utils/SecurityUtils.java Thu Sep 30 12:53:33 2010
@@ -25,6 +25,7 @@ import org.apache.myfaces.extensions.cdi
import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByClass;
import javax.interceptor.InvocationContext;
+import javax.enterprise.inject.spi.BeanManager;
import java.util.Set;
import java.util.HashSet;
@@ -34,6 +35,7 @@ import java.util.HashSet;
public class SecurityUtils
{
public static void invokeVoters(InvocationContext invocationContext,
+ BeanManager beanManager,
Class<? extends AccessDecisionVoter>[] accessDecisionVoters,
Class<? extends ViewConfig> errorView)
{
@@ -47,7 +49,7 @@ public class SecurityUtils
AccessDecisionVoter voter;
for(Class<? extends AccessDecisionVoter> voterClass : accessDecisionVoters)
{
- voter = getOrCreateScopedInstanceOfBeanByClass(voterClass);
+ voter = getOrCreateScopedInstanceOfBeanByClass(beanManager, voterClass);
voter.checkPermission(invocationContext, violations);
if(violations.size() > 0)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.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/view/PhasesLifecycleCallbackPhaseListener.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java Thu Sep 30 12:53:33 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.config.view;
-import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
+import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByName;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.Advanced;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ExceptionUtils.invalidPhasesCallbackMethod;
@@ -30,6 +30,7 @@ import javax.faces.event.PhaseId;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
+import javax.enterprise.inject.spi.BeanManager;
import java.util.List;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
@@ -39,6 +40,7 @@ import java.lang.reflect.InvocationTarge
*/
@Advanced
@JsfPhaseListener
+@SuppressWarnings({"UnusedDeclaration"})
public final class PhasesLifecycleCallbackPhaseListener implements PhaseListener
{
private static final long serialVersionUID = 6893021853444122202L;
@@ -48,6 +50,9 @@ public final class PhasesLifecycleCallba
@Inject
private WindowContext windowContext;
+ @Inject
+ private BeanManager beanManager;
+
public void afterPhase(PhaseEvent event)
{
try
@@ -186,7 +191,7 @@ public final class PhasesLifecycleCallba
}
//TODO provide a detailed error message in case of a missing bean
- bean = CodiUtils.getOrCreateScopedInstanceOfBeanByName(beanEntry.getBeanName(), Object.class);
+ bean = getOrCreateScopedInstanceOfBeanByName(this.beanManager, beanEntry.getBeanName(), Object.class);
invokePhasesLifecycleCallbacks(bean, lifecycleCallbacks, phaseEvent);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.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/view/PreRenderViewBeanLoader.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PreRenderViewBeanLoader.java Thu Sep 30 12:53:33 2010
@@ -23,6 +23,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
import javax.faces.event.PhaseEvent;
import java.util.List;
@@ -31,7 +32,8 @@ import java.util.List;
*/
final class PreRenderViewBeanLoader
{
- protected void initBeans(@Observes @BeforePhase(JsfPhaseId.RENDER_RESPONSE) PhaseEvent event)
+ protected void initBeans(
+ @Observes @BeforePhase(JsfPhaseId.RENDER_RESPONSE) PhaseEvent event, BeanManager beanManager)
{
String viewId = event.getFacesContext().getViewRoot().getViewId();
@@ -47,7 +49,7 @@ final class PreRenderViewBeanLoader
for(PageBeanConfigEntry beanEntry : beanEntries)
{
//resolve bean to trigger @PostConstruct if it isn't scoped
- CodiUtils.getOrCreateScopedInstanceOfBeanByName(beanEntry.getBeanName(), Object.class);
+ CodiUtils.getOrCreateScopedInstanceOfBeanByName(beanManager, beanEntry.getBeanName(), Object.class);
}
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.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/view/ViewConfigCache.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCache.java Thu Sep 30 12:53:33 2010
@@ -20,9 +20,8 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
import org.apache.myfaces.extensions.cdi.core.api.security.DefaultErrorView;
-
-import java.util.HashMap;
-import java.util.Map;
+import static org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCacheStore.*;
+import static org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCacheStore.setDefaultErrorView;
/**
* TODO move exceptions to util class
@@ -31,27 +30,18 @@ import java.util.Map;
*/
public class ViewConfigCache
{
- //we don't need a ConcurrentHashMap - write access is only allowed during the startup (by one thread)
- private static Map<String, ViewConfigEntry> viewIdToViewDefinitionEntryMapping
- = new HashMap<String, ViewConfigEntry>();
-
- private static Map<Class<? extends ViewConfig>, ViewConfigEntry> viewDefinitionToViewDefinitionEntryMapping
- = new HashMap<Class<? extends ViewConfig>, ViewConfigEntry>();
-
- private static ViewConfigEntry defaultErrorView;
-
static void addViewDefinition(String viewId, ViewConfigEntry viewDefinitionEntry)
{
tryToStorePageAsDefaultErrorPage(viewDefinitionEntry);
- if(viewIdToViewDefinitionEntryMapping.containsKey(viewId))
+ if(getViewIdToViewDefinitionEntryMapping().containsKey(viewId))
{
throw new IllegalArgumentException(viewId + " is already mapped to "
+ viewId + " -> a further view definition (" +
viewDefinitionEntry.getViewDefinitionClass().getName() + ") is invalid");
}
- viewIdToViewDefinitionEntryMapping.put(viewId, viewDefinitionEntry);
- viewDefinitionToViewDefinitionEntryMapping
+ getViewIdToViewDefinitionEntryMapping().put(viewId, viewDefinitionEntry);
+ getViewDefinitionToViewDefinitionEntryMapping()
.put(viewDefinitionEntry.getViewDefinitionClass(), viewDefinitionEntry);
}
@@ -59,29 +49,29 @@ public class ViewConfigCache
{
if(DefaultErrorView.class.isAssignableFrom(viewDefinitionEntry.getViewDefinitionClass()))
{
- if(defaultErrorView != null)
+ if(getDefaultErrorViewForApplication() != null)
{
throw new IllegalStateException("multiple error pages found " +
- defaultErrorView.getViewDefinitionClass().getClass().getName() + " and " +
+ getDefaultErrorViewForApplication().getViewDefinitionClass().getClass().getName() + " and " +
viewDefinitionEntry.getViewDefinitionClass().getName());
}
- defaultErrorView = viewDefinitionEntry;
+ setDefaultErrorView(viewDefinitionEntry);
}
}
public static ViewConfigEntry getViewDefinition(String viewId)
{
- return viewIdToViewDefinitionEntryMapping.get(viewId);
+ return getViewIdToViewDefinitionEntryMapping().get(viewId);
}
public static ViewConfigEntry getViewDefinition(Class<? extends ViewConfig> viewDefinitionClass)
{
- return viewDefinitionToViewDefinitionEntryMapping.get(viewDefinitionClass);
+ return getViewDefinitionToViewDefinitionEntryMapping().get(viewDefinitionClass);
}
public static ViewConfigEntry getDefaultErrorView()
{
- return defaultErrorView;
+ return getDefaultErrorViewForApplication();
}
}
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCacheStore.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/view/ViewConfigCacheStore.java?rev=1003047&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCacheStore.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigCacheStore.java Thu Sep 30 12:53:33 2010
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.jsf.impl.config.view;
+
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
+import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
+
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * @author Gerhard Petracek
+ */
+class ViewConfigCacheStore
+{
+ //we don't need a ConcurrentHashMap - write access is only allowed during the startup (by one thread)
+
+ private static Map<ClassLoader, Map<String, ViewConfigEntry>> viewIdToViewDefinitionEntryMapping
+ = new HashMap<ClassLoader, Map<String, ViewConfigEntry>>();
+
+ private static Map<ClassLoader, Map<Class<? extends ViewConfig>, ViewConfigEntry>>
+ viewDefinitionToViewDefinitionEntryMapping =
+ new HashMap<ClassLoader, Map<Class<? extends ViewConfig>, ViewConfigEntry>>();
+
+ private static Map<ClassLoader, ViewConfigEntry> defaultErrorView = new HashMap<ClassLoader, ViewConfigEntry>();
+
+ static Map<String, ViewConfigEntry> getViewIdToViewDefinitionEntryMapping()
+ {
+ Map<String, ViewConfigEntry> result = viewIdToViewDefinitionEntryMapping.get(getClassloader());
+
+ if(result == null)
+ {
+ result = new HashMap<String, ViewConfigEntry>();
+ viewIdToViewDefinitionEntryMapping.put(getClassloader(), result);
+ }
+
+ return result;
+ }
+
+ static Map<Class<? extends ViewConfig>, ViewConfigEntry> getViewDefinitionToViewDefinitionEntryMapping()
+ {
+ Map<Class<? extends ViewConfig>, ViewConfigEntry> result =
+ viewDefinitionToViewDefinitionEntryMapping.get(getClassloader());
+
+ if(result == null)
+ {
+ result = new HashMap<Class<? extends ViewConfig>, ViewConfigEntry>();
+ viewDefinitionToViewDefinitionEntryMapping.put(getClassloader(), result);
+ }
+ return result;
+ }
+
+ static ViewConfigEntry getDefaultErrorViewForApplication()
+ {
+ return defaultErrorView.get(getClassloader());
+ }
+
+ public static void setDefaultErrorView(ViewConfigEntry viewDefinitionEntry)
+ {
+ defaultErrorView.put(getClassloader(), viewDefinitionEntry);
+ }
+
+ private static ClassLoader getClassloader()
+ {
+ return ClassUtils.getClassLoader(null);
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.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/view/ViewConfigEntry.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java Thu Sep 30 12:53:33 2010
@@ -21,11 +21,13 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
import org.apache.myfaces.extensions.cdi.core.api.security.AccessDecisionVoter;
import org.apache.myfaces.extensions.cdi.core.api.security.DefaultErrorView;
-import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
+import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
+import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByName;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageBean;
import javax.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
import java.util.List;
import java.util.Collections;
import java.util.ArrayList;
@@ -50,6 +52,8 @@ public class ViewConfigEntry
//meta-data
private List<Annotation> metaDataList;
+ private BeanManager beanManager;
+
public ViewConfigEntry(String viewId,
Class<? extends ViewConfig> viewDefinitionClass,
NavigationMode navigationMode,
@@ -129,7 +133,7 @@ public class ViewConfigEntry
if (!methodList.isEmpty())
{
//TODO provide a detailed error message in case of a missing bean
- bean = CodiUtils.getOrCreateScopedInstanceOfBeanByName(beanEntry.getBeanName(), Object.class);
+ bean = getOrCreateScopedInstanceOfBeanByName(getBeanManager(), beanEntry.getBeanName(), Object.class);
if (bean == null)
{
@@ -250,6 +254,16 @@ public class ViewConfigEntry
return new PageBeanConfigEntry(pageBeanName, pageBeanClass);
}
+ private BeanManager getBeanManager()
+ {
+ if(this.beanManager == null)
+ {
+ this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
+ }
+
+ return this.beanManager;
+ }
+
@Override
public boolean equals(Object o)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.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/listener/phase/JsfRequestLifecyclePhaseListener.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.java Thu Sep 30 12:53:33 2010
@@ -20,20 +20,27 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.JsfPhaseListener;
import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByName;
+import org.apache.myfaces.extensions.cdi.core.api.Advanced;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
+import javax.inject.Inject;
+import javax.enterprise.inject.spi.BeanManager;
/**
* @author Gerhard Petracek
*/
+@Advanced
@JsfPhaseListener
public class JsfRequestLifecyclePhaseListener implements PhaseListener
{
private static final long serialVersionUID = -4351903831660165998L;
+ @Inject
+ private BeanManager beanManager;
+
public void beforePhase(PhaseEvent phaseEvent)
{
resolveBroadcaster().broadcastBeforeEvent(phaseEvent);
@@ -47,7 +54,7 @@ public class JsfRequestLifecyclePhaseLis
private JsfRequestLifecycleBroadcaster resolveBroadcaster()
{
//cdi has to inject the event
- return getOrCreateScopedInstanceOfBeanByName(
+ return getOrCreateScopedInstanceOfBeanByName(this.beanManager,
JsfRequestLifecycleBroadcaster.BEAN_NAME, JsfRequestLifecycleBroadcaster.class);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.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/navigation/ViewConfigAwareNavigationHandler.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java Thu Sep 30 12:53:33 2010
@@ -69,6 +69,7 @@ public class ViewConfigAwareNavigationHa
if(!this.otherOutcomes.contains(outcome))
{
+ initBeanManager();
if(outcome.startsWith("class "))
{
outcome = outcome.substring(6);
@@ -95,7 +96,7 @@ public class ViewConfigAwareNavigationHa
//security
try
{
- invokeVoters(null, entry.getAccessDecisionVoters(), entry.getErrorView());
+ invokeVoters(null, this.beanManager, entry.getAccessDecisionVoters(), entry.getErrorView());
}
catch (AccessDeniedException accessDeniedException)
{
@@ -151,7 +152,6 @@ public class ViewConfigAwareNavigationHa
if(oldViewConfigEntry != null)
{
- initBeanManager();
PreViewConfigNavigateEvent navigateEvent = new PreViewConfigNavigateEvent(
oldViewConfigEntry.getViewDefinitionClass(), newViewConfigEntry.getViewDefinitionClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.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/BeanStorage.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanStorage.java Thu Sep 30 12:53:33 2010
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation;
-import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.event.UnscopeBeanEvent;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationGroup;
import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.BeanEntry;
@@ -45,6 +44,11 @@ class BeanStorage implements Serializabl
private Map<Class, BeanEntry<Serializable>> beanMap = new ConcurrentHashMap<Class, BeanEntry<Serializable>>();
+ public BeanStorage(BeanManager beanManager)
+ {
+ this.beanManager = beanManager;
+ }
+
BeanEntry getBean(Class beanClass)
{
return this.beanMap.get(beanClass);
@@ -77,17 +81,7 @@ class BeanStorage implements Serializabl
private <T extends Serializable> void fireUnscopeBeanEvent(T instance)
{
- getOrCreateBeanManager().fireEvent(new UnscopeBeanEvent(instance));
- }
-
- private BeanManager getOrCreateBeanManager()
- {
- if (this.beanManager == null)
- {
- this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
- }
-
- return this.beanManager;
+ this.beanManager.fireEvent(new UnscopeBeanEvent(instance));
}
@Override
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=1003047&r1=1003046&r2=1003047&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 Thu Sep 30 12:53:33 2010
@@ -44,7 +44,7 @@ public class DefaultConversation impleme
private BeanManager beanManager;
- private final BeanStorage beanStorage = new BeanStorage();
+ private final BeanStorage beanStorage;
private final boolean closeConversationEventEnable;
private final boolean restartConversationEventEnable;
@@ -57,6 +57,7 @@ public class DefaultConversation impleme
this.conversationKey = conversationKey;
this.expirationEvaluator = expirationEvaluator;
this.beanManager = beanManager;
+ this.beanStorage = new BeanStorage(this.beanManager);
this.closeConversationEventEnable = conversationConfig.isCloseConversationEventEnable();
this.restartConversationEventEnable = conversationConfig.isRestartConversationEventEnable();
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=1003047&r1=1003046&r2=1003047&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 Thu Sep 30 12:53:33 2010
@@ -105,7 +105,8 @@ class GroupedConversationContext extends
protected ConversationConfig getConversationConfig()
{
- return getOrCreateScopedInstanceOfBeanByClass(ConfigResolver.class).resolve(JsfAwareWindowContextConfig.class);
+ return getOrCreateScopedInstanceOfBeanByClass(this.beanManager,ConfigResolver.class)
+ .resolve(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/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=1003047&r1=1003046&r2=1003047&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 Thu Sep 30 12:53:33 2010
@@ -110,7 +110,7 @@ public class JsfWindowContext implements
public EditableConversation getConversation(Class conversationGroupKey, Annotation... qualifiers)
{
- Class<? extends Annotation> scopeType = convertToScope(conversationGroupKey, qualifiers);
+ Class<? extends Annotation> scopeType = convertToScope(this.beanManager, conversationGroupKey, qualifiers);
ConversationKey conversationKey =
new DefaultConversationKey(scopeType, conversationGroupKey, qualifiers);
@@ -141,7 +141,7 @@ public class JsfWindowContext implements
public Conversation closeConversation(Class conversationGroupKey, Annotation... qualifiers)
{
- Class<? extends Annotation> scopeType = convertToScope(conversationGroupKey, qualifiers);
+ Class<? extends Annotation> scopeType = convertToScope(this.beanManager, conversationGroupKey, qualifiers);
ConversationKey conversationKey =
new DefaultConversationKey(scopeType, conversationGroupKey, qualifiers);
@@ -203,7 +203,7 @@ public class JsfWindowContext implements
public EditableConversation createConversation(Class conversationGroupKey, Annotation... qualifiers)
{
- Class<? extends Annotation> scopeType = convertToScope(conversationGroupKey, qualifiers);
+ Class<? extends Annotation> scopeType = convertToScope(this.beanManager, conversationGroupKey, qualifiers);
ConversationKey conversationKey =
new DefaultConversationKey(scopeType, conversationGroupKey, qualifiers);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityInterceptor.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/security/SecurityInterceptor.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityInterceptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityInterceptor.java Thu Sep 30 12:53:33 2010
@@ -25,6 +25,8 @@ import static org.apache.myfaces.extensi
import javax.interceptor.AroundInvoke;
import javax.interceptor.InvocationContext;
import javax.interceptor.Interceptor;
+import javax.inject.Inject;
+import javax.enterprise.inject.spi.BeanManager;
import java.lang.reflect.Method;
import java.io.Serializable;
@@ -37,6 +39,9 @@ public class SecurityInterceptor impleme
{
private static final long serialVersionUID = -7094673146532371976L;
+ @Inject
+ private BeanManager beanManager;
+
interface PlaceHolderVoter extends AccessDecisionVoter
{
}
@@ -48,7 +53,7 @@ public class SecurityInterceptor impleme
Class<? extends AccessDecisionVoter>[] voterClasses = secured.value();
- invokeVoters(invocationContext, voterClasses, secured.errorView());
+ invokeVoters(invocationContext, this.beanManager, voterClasses, secured.errorView());
return invocationContext.proceed();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.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/security/SecurityViewListener.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViewListener.java Thu Sep 30 12:53:33 2010
@@ -27,6 +27,7 @@ import static org.apache.myfaces.extensi
import org.apache.myfaces.extensions.cdi.core.api.security.AccessDeniedException;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.BeanManager;
import javax.faces.event.PhaseEvent;
import javax.faces.context.FacesContext;
@@ -35,7 +36,8 @@ import javax.faces.context.FacesContext;
*/
public class SecurityViewListener
{
- public void checkPermission(@Observes @AfterPhase(JsfPhaseId.RESTORE_VIEW) PhaseEvent event)
+ public void checkPermission(
+ @Observes @AfterPhase(JsfPhaseId.RESTORE_VIEW) PhaseEvent event, BeanManager beanManager)
{
FacesContext facesContext = event.getFacesContext();
ViewConfigEntry entry = ViewConfigCache.getViewDefinition(facesContext.getViewRoot().getViewId());
@@ -47,7 +49,7 @@ public class SecurityViewListener
try
{
- invokeVoters(null, entry.getAccessDecisionVoters(), entry.getErrorView());
+ invokeVoters(null, beanManager, entry.getAccessDecisionVoters(), entry.getErrorView());
}
catch (AccessDeniedException accessDeniedException)
{
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=1003047&r1=1003046&r2=1003047&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 Thu Sep 30 12:53:33 2010
@@ -429,7 +429,8 @@ public class ConversationUtils
return windowContexts.size() < count;
}
- public static Class<? extends Annotation> convertToScope(Class conversationGroupKey, Annotation... qualifiers)
+ public static Class<? extends Annotation> convertToScope(
+ BeanManager beanManager, Class conversationGroupKey, Annotation... qualifiers)
{
Class<? extends Annotation> scopeType = conversationGroupToScopeCache.get(conversationGroupKey);
@@ -444,8 +445,6 @@ public class ConversationUtils
}
else
{
- BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
-
//we just find a bean if the class name is used as implicit group-key
//explicit group-keys are only supported for @ConversationScoped
Set<Bean<?>> beans = beanManager.getBeans(conversationGroupKey, qualifiers);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.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/listener/system/CodiJsf2SystemEventListener.java?rev=1003047&r1=1003046&r2=1003047&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/system/CodiJsf2SystemEventListener.java Thu Sep 30 12:53:33 2010
@@ -20,6 +20,7 @@ package org.apache.myfaces.extensions.cd
import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByName;
import org.apache.myfaces.extensions.cdi.core.api.Deactivatable;
+import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
import javax.faces.event.SystemEventListener;
@@ -27,6 +28,7 @@ import javax.faces.event.SystemEvent;
import javax.faces.event.PostConstructApplicationEvent;
import javax.faces.event.PreDestroyApplicationEvent;
import javax.faces.application.Application;
+import javax.enterprise.inject.spi.BeanManager;
/**
* @author Gerhard Petracek
@@ -59,8 +61,10 @@ public class CodiJsf2SystemEventListener
private SystemEventBroadcaster resolveBroadcaster()
{
+ BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
//cdi has to inject the event
- return getOrCreateScopedInstanceOfBeanByName(SystemEventBroadcaster.BEAN_NAME, SystemEventBroadcaster.class);
+ return getOrCreateScopedInstanceOfBeanByName(
+ beanManager, SystemEventBroadcaster.BEAN_NAME, SystemEventBroadcaster.class);
}
public boolean isActivated()