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 2011/02/23 12:02:11 UTC
svn commit: r1073697 - in /myfaces/extensions/cdi/trunk:
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/
core/api/src/main/java/org/apache/myfaces/extens...
Author: gpetracek
Date: Wed Feb 23 11:02:10 2011
New Revision: 1073697
URL: http://svn.apache.org/viewvc?rev=1073697&view=rev
Log:
cleanup
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/BeanManagerAware.java
Modified:
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java
myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java
myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.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/ViewConfigCache.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfWindowContext.java
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/AbstractClassDeactivator.java Wed Feb 23 11:02:10 2011
@@ -29,7 +29,7 @@ import java.util.HashSet;
public abstract class AbstractClassDeactivator implements ClassDeactivator
{
//HashSet due to Serializable warning in checkstyle rules
- private HashSet<Class> deactivatedClasses;
+ private HashSet<Class> deactivatedClasses = null;
/**
* {@inheritDoc}
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/projectstage/ProjectStage.java Wed Feb 23 11:02:10 2011
@@ -114,7 +114,7 @@ public abstract class ProjectStage imple
/**
* logger for the ProjectStage
*/
- private static final Logger log = Logger.getLogger(ProjectStage.class.getName());
+ private static final Logger LOG = Logger.getLogger(ProjectStage.class.getName());
/**
@@ -127,7 +127,7 @@ public abstract class ProjectStage imple
ServiceLoader<ProjectStageHolder> psSl = ServiceLoader.load(ProjectStageHolder.class);
for (ProjectStageHolder aPsSl : psSl)
{
- log.fine("registering ProjectStages from ProjectStageHolder " + aPsSl.getClass().getName());
+ LOG.fine("registering ProjectStages from ProjectStageHolder " + aPsSl.getClass().getName());
}
}
Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/tools/DefaultAnnotation.java Wed Feb 23 11:02:10 2011
@@ -47,7 +47,7 @@ public class DefaultAnnotation implement
// NOTE that this cache needs to be a WeakHashMap in order to prevent a memory leak
// (the garbage collector should be able to remove the ClassLoader).
- private static final Map<ClassLoader, Map<String, Annotation>> annotationCachePerClassLoader
+ private static Map<ClassLoader, Map<String, Annotation>> annotationCachePerClassLoader
= new WeakHashMap<ClassLoader, Map<String, Annotation>>();
public static <T extends Annotation> T of(Class<T> annotationClass)
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/projectstage/ProjectStageProducer.java Wed Feb 23 11:02:10 2011
@@ -105,7 +105,7 @@ public class ProjectStageProducer implem
*
* @return the ProjectStageProducer instance.
*/
- public synchronized static ProjectStageProducer getInstance()
+ public static synchronized ProjectStageProducer getInstance()
{
if (projectStageProducer == null)
{
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/CodiUtils.java Wed Feb 23 11:02:10 2011
@@ -368,12 +368,12 @@ public class CodiUtils
return method.invoke(instance, EMPTY_OBJECT_ARRAY);
}
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
catch (Exception e)
{
- if(e instanceof RuntimeException)
- {
- throw (RuntimeException)e;
- }
throw new UnhandledException("Exception in method call : " + method.getName(), e);
}
finally
Modified: myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java (original)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/java/org/apache/myfaces/extensions/cdi/core/impl/util/JndiUtils.java Wed Feb 23 11:02:10 2011
@@ -32,8 +32,7 @@ import java.util.logging.Logger;
*/
public final class JndiUtils
{
-
- private final static Logger log = Logger.getLogger(JndiUtils.class.getName());
+ private static final Logger LOG = Logger.getLogger(JndiUtils.class.getName());
private static InitialContext initialContext = null;
@@ -129,14 +128,14 @@ public final class JndiUtils
catch (Exception e)
{
// could not create instance
- log.log(Level.SEVERE, "Class " + lookedUpClass + " from JNDI lookup for name "
+ LOG.log(Level.SEVERE, "Class " + lookedUpClass + " from JNDI lookup for name "
+ name + " could not be instantiated", e);
}
}
else
{
// lookedUpClass does not extend/implement expectedClass
- log.log(Level.SEVERE, "JNDI lookup for key " + name
+ LOG.log(Level.SEVERE, "JNDI lookup for key " + name
+ " returned class " + lookedUpClass.getName()
+ " which does not implement/extend the expected class"
+ expectedClass.getName());
@@ -145,14 +144,14 @@ public final class JndiUtils
catch (ClassNotFoundException cnfe)
{
// could not find class
- log.log(Level.SEVERE, "Could not find Class " + lookedUp
+ LOG.log(Level.SEVERE, "Could not find Class " + lookedUp
+ " from JNDI lookup for name " + name, cnfe);
}
}
else
{
// we have a value, but the value does not fit
- log.log(Level.SEVERE, "JNDI lookup for key " + name + " should return a value of "
+ LOG.log(Level.SEVERE, "JNDI lookup for key " + name + " should return a value of "
+ expectedClass + ", but returned " + lookedUp);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/java/org/apache/myfaces/extensions/cdi/bv/api/ClassLevelValidator.java Wed Feb 23 11:02:10 2011
@@ -67,12 +67,12 @@ public abstract class ClassLevelValidato
Method method = this.constraint.annotationType().getDeclaredMethod("message");
return (String) method.invoke(this.constraint);
}
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
catch (Exception e)
{
- if(e instanceof RuntimeException)
- {
- throw (RuntimeException)e;
- }
throw new UnhandledException(e);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/DefaultTransactionalInterceptorStrategy.java Wed Feb 23 11:02:10 2011
@@ -73,8 +73,8 @@ public class DefaultTransactionalInterce
new ConcurrentHashMap<ClassLoader, Map<String, PersistenceContextMetaEntry>>();
/** 1 ms in nanoTime ticks */
- final static long LONG_MILLISECOND = 1000000L;
- final static long LONG_RUNNING_THRESHOLD = 300L * LONG_MILLISECOND;
+ static final long LONG_MILLISECOND = 1000000L;
+ static final long LONG_RUNNING_THRESHOLD = 300L * LONG_MILLISECOND;
public Object execute(InvocationContext context) throws Exception
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.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/ExtractedViewConfigDefinitionEntry.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedViewConfigDefinitionEntry.java Wed Feb 23 11:02:10 2011
@@ -37,10 +37,10 @@ import java.util.Collections;
*/
class ExtractedViewConfigDefinitionEntry implements ViewConfigEntry
{
- final static String ROOT_PATH = "/";
- final static String DEFAULT_EXTENSION = Page.Extension.XHTML;
+ static final String ROOT_PATH = "/";
+ static final String DEFAULT_EXTENSION = Page.Extension.XHTML;
- protected final static String DEFAULT_PAGE_NAME = "";
+ protected static final String DEFAULT_PAGE_NAME = "";
private static final String NOT_IMPLEMENTED_MESSAGE = "not implemented";
private List<Class<? extends Annotation>> foundAndBlockedMetaDataTypes
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=1073697&r1=1073696&r2=1073697&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 Wed Feb 23 11:02:10 2011
@@ -21,6 +21,7 @@ package org.apache.myfaces.extensions.cd
import static org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils.getOrCreateScopedInstanceOfBeanByName;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext;
import org.apache.myfaces.extensions.cdi.core.api.Advanced;
+import org.apache.myfaces.extensions.cdi.core.api.UnhandledException;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ExceptionUtils.invalidPhasesCallbackMethod;
import org.apache.myfaces.extensions.cdi.jsf.api.listener.phase.JsfPhaseListener;
import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.spi.PageBeanConfigEntry;
@@ -58,38 +59,16 @@ public final class PhasesLifecycleCallba
public void afterPhase(PhaseEvent event)
{
- try
- {
processInitView(event);
processPostRenderView(event);
processPhaseCallbacks(event, false);
- }
- catch (Exception e)
- {
- if(!(e instanceof RuntimeException))
- {
- throw new IllegalStateException(e);
- }
- throw (RuntimeException)e;
- }
}
public void beforePhase(PhaseEvent event)
{
- try
- {
- processInitView(event);
- processPreRenderView(event);
- processPhaseCallbacks(event, true);
- }
- catch (Exception e)
- {
- if(!(e instanceof RuntimeException))
- {
- throw new IllegalStateException(e);
- }
- throw (RuntimeException)e;
- }
+ processInitView(event);
+ processPreRenderView(event);
+ processPhaseCallbacks(event, true);
}
private void processInitView(PhaseEvent event)
@@ -164,7 +143,7 @@ public final class PhasesLifecycleCallba
return javax.faces.event.PhaseId.ANY_PHASE;
}
- private void processPhaseCallbacks(PhaseEvent phaseEvent, boolean beforePhase) throws Exception
+ private void processPhaseCallbacks(PhaseEvent phaseEvent, boolean beforePhase)
{
UIViewRoot viewRoot = phaseEvent.getFacesContext().getViewRoot();
@@ -219,27 +198,37 @@ public final class PhasesLifecycleCallba
}
private void invokePhasesLifecycleCallbacks(Object bean, List<Method> lifecycleCallbacks, PhaseEvent phaseEvent)
- throws InvocationTargetException, IllegalAccessException
{
- Class<?>[] parameterTypes;
- for(Method currentMethod : lifecycleCallbacks)
+ try
{
- currentMethod.setAccessible(true);
-
- parameterTypes = currentMethod.getParameterTypes();
- if(parameterTypes.length == 0)
+ Class<?>[] parameterTypes;
+ for(Method currentMethod : lifecycleCallbacks)
{
- currentMethod.invoke(bean);
- }
- else if(parameterTypes.length == 1 && PhaseEvent.class.isAssignableFrom(parameterTypes[0]))
- {
- currentMethod.invoke(bean, phaseEvent);
- }
- else
- {
- throw invalidPhasesCallbackMethod(bean.getClass(), currentMethod);
+ currentMethod.setAccessible(true);
+
+ parameterTypes = currentMethod.getParameterTypes();
+ if(parameterTypes.length == 0)
+ {
+ currentMethod.invoke(bean);
+ }
+ else if(parameterTypes.length == 1 && PhaseEvent.class.isAssignableFrom(parameterTypes[0]))
+ {
+ currentMethod.invoke(bean, phaseEvent);
+ }
+ else
+ {
+ throw invalidPhasesCallbackMethod(bean.getClass(), currentMethod);
+ }
}
}
+ catch (IllegalAccessException e)
+ {
+ throw new UnhandledException(e);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new UnhandledException(e);
+ }
}
private boolean isValidView(FacesContext facesContext)
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=1073697&r1=1073696&r2=1073697&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 Wed Feb 23 11:02:10 2011
@@ -286,7 +286,7 @@ public class ViewConfigCache
return !Boolean.TRUE.equals(lazyInitAllowed.get(getClassloader()));
}
- private synchronized static void registerInlineViewConfigEntry()
+ private static synchronized void registerInlineViewConfigEntry()
{
List<InlineViewConfigEntry> inlineViewConfigEntryList =
inlineViewDefinitionEntryList.get(getClassloader());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.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/projectstage/JsfProjectStageProducer.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/projectstage/JsfProjectStageProducer.java Wed Feb 23 11:02:10 2011
@@ -33,10 +33,10 @@ public class JsfProjectStageProducer ext
private static final long serialVersionUID = 2378537865206165557L;
/** JNDI path for the ProjectStage */
- private final static String PROJECT_STAGE_JNDI_NAME = "java:comp/env/jsf/ProjectStage";
+ private static final String PROJECT_STAGE_JNDI_NAME = "java:comp/env/jsf/ProjectStage";
/** System Property to set the ProjectStage, if not present via the standard way */
- private final static String JSF_PROJECT_STAGE_SYSTEM_PROPERTY_NAME = "faces.PROJECT_STAGE";
+ private static final String JSF_PROJECT_STAGE_SYSTEM_PROPERTY_NAME = "faces.PROJECT_STAGE";
@Override
protected ProjectStage resolveProjectStage()
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java?rev=1073697&r1=1073696&r2=1073697&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/JsfAwareConversationFactory.java Wed Feb 23 11:02:10 2011
@@ -29,15 +29,17 @@ import org.apache.myfaces.extensions.cdi
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
/**
* @author Gerhard Petracek
*/
@ApplicationScoped
-public class JsfAwareConversationFactory implements ConversationFactory, BeanManagerAware
+public class JsfAwareConversationFactory implements ConversationFactory
{
private static final long serialVersionUID = 2329113439978807663L;
+ @Inject
private BeanManager beanManager;
public EditableConversation createConversation(ConversationKey conversationKey, ConversationConfig configuration)
@@ -91,9 +93,4 @@ public class JsfAwareConversationFactory
}
return conversation;
}
-
- public void setBeanManager(BeanManager beanManager)
- {
- this.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=1073697&r1=1073696&r2=1073697&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 Wed Feb 23 11:02:10 2011
@@ -235,11 +235,6 @@ public class JsfWindowContext implements
new DefaultConversationKey(scopeType, conversationGroupKey, qualifiers);
ConversationFactory conversationFactory = CodiUtils.getContextualReferenceByClass(ConversationFactory.class);
-
- if(conversationFactory instanceof BeanManagerAware)
- {
- ((BeanManagerAware)conversationFactory).setBeanManager(this.beanManager);
- }
return conversationFactory.createConversation(conversationKey, this.conversationConfig);
}