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/03/27 16:36:44 UTC
svn commit: r1085945 [2/3] - in /myfaces/extensions/cdi/trunk:
component-support-modules/trinidad-support/src/main/java/org/apache/myfaces/extensions/cdi/trinidad/impl/
core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/
core/api/src/mai...
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigExtractor.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/DefaultViewConfigExtractor.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigExtractor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigExtractor.java Sun Mar 27 14:36:40 2011
@@ -42,6 +42,9 @@ class DefaultViewConfigExtractor impleme
{
private static final long serialVersionUID = 5794817257216134993L;
+ /**
+ * {@inheritDoc}
+ */
public ViewConfigDescriptor extractViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
{
//use the interface to make clear which information we really need
@@ -50,11 +53,17 @@ class DefaultViewConfigExtractor impleme
return extractViewConfigDescriptor(viewDefinitionClass, viewConfigDescriptor);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isInlineViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
{
return isResolvable(viewDefinitionClass, new ArrayList<Class<? extends Annotation>>());
}
+ /**
+ * {@inheritDoc}
+ */
public ViewConfigDescriptor extractInlineViewConfig(Class<? extends ViewConfig> viewDefinitionClass)
{
Class viewConfigRootMarker = ViewConfigCache.getInlineViewConfigRootMarker();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.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/ExtractedInlineViewConfigDefinitionEntry.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ExtractedInlineViewConfigDefinitionEntry.java Sun Mar 27 14:36:40 2011
@@ -26,7 +26,7 @@ import org.apache.myfaces.extensions.cdi
*/
class ExtractedInlineViewConfigDefinitionEntry extends ExtractedViewConfigDefinitionEntry
{
- public ExtractedInlineViewConfigDefinitionEntry(Class<? extends ViewConfig> viewDefinitionClass, String basePath)
+ ExtractedInlineViewConfigDefinitionEntry(Class<? extends ViewConfig> viewDefinitionClass, String basePath)
{
super(viewDefinitionClass);
@@ -40,12 +40,18 @@ class ExtractedInlineViewConfigDefinitio
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void setBasePath(String currentBasePath)
{
//filtered
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String getViewId()
{
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -61,6 +61,10 @@ class ExtractedViewConfigDefinitionEntry
private Page.NavigationMode navigationMode = null;
private Page.ViewParameterMode viewParameterMode = null;
+ /**
+ * Constructor for creating a {@link EditableViewConfigDescriptor} for the given {@link ViewConfig} definition
+ * @param viewDefinitionClass current view-config
+ */
public ExtractedViewConfigDefinitionEntry(Class<? extends ViewConfig> viewDefinitionClass)
{
this.viewDefinitionClass = viewDefinitionClass;
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -61,6 +61,9 @@ public final class PhasesLifecycleCallba
@Inject
private BeanManager beanManager;
+ /**
+ * {@inheritDoc}
+ */
public void afterPhase(PhaseEvent event)
{
processInitView(event);
@@ -68,6 +71,9 @@ public final class PhasesLifecycleCallba
processPhaseCallbacks(event, false);
}
+ /**
+ * {@inheritDoc}
+ */
public void beforePhase(PhaseEvent event)
{
processInitView(event);
@@ -143,6 +149,9 @@ public final class PhasesLifecycleCallba
}
}
+ /**
+ * {@inheritDoc}
+ */
public javax.faces.event.PhaseId getPhaseId()
{
return javax.faces.event.PhaseId.ANY_PHASE;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.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/ViewConfigExtension.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java Sun Mar 27 14:36:40 2011
@@ -48,6 +48,10 @@ public class ViewConfigExtension impleme
{
private Logger logger = Logger.getLogger(ViewConfigExtension.class.getName());
+ /**
+ * Initializes the whole view-config data-structures.
+ * @param processAnnotatedType current process-annotated-type
+ */
public void processPageDefinitions(@Observes ProcessAnnotatedType processAnnotatedType)
{
if(!isActivated())
@@ -284,6 +288,9 @@ public class ViewConfigExtension impleme
processAnnotatedType.veto();
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.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/ViewControllerActionListener.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewControllerActionListener.java Sun Mar 27 14:36:40 2011
@@ -36,12 +36,19 @@ public class ViewControllerActionListene
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link ActionListener}
+ * @param wrapped action-listener which should be wrapped
+ */
public ViewControllerActionListener(ActionListener wrapped)
{
this.wrapped = wrapped;
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public void processAction(ActionEvent actionEvent)
{
if(this.deactivated)
@@ -60,6 +67,9 @@ public class ViewControllerActionListene
this.wrapped.processAction(actionEvent);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigExtractor.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/spi/ViewConfigExtractor.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigExtractor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigExtractor.java Sun Mar 27 14:36:40 2011
@@ -28,9 +28,24 @@ import java.io.Serializable;
*/
public interface ViewConfigExtractor extends Serializable
{
+ /**
+ * Creates a {@link ViewConfigDescriptor} for the given view-config class
+ * @param viewDefinitionClass current view-config class
+ * @return descriptor which represents the view-config for the given config class
+ */
ViewConfigDescriptor extractViewConfig(Class<? extends ViewConfig> viewDefinitionClass);
+ /**
+ * Evaluates if the given view-config class is an inline conifg - that means if it is a resolvable (page-)bean
+ * @param viewDefinitionClass view-config class
+ * @return true if it is a resolvable (page-)bean with inline view-config, false otherwise
+ */
boolean isInlineViewConfig(Class<? extends ViewConfig> viewDefinitionClass);
+ /**
+ * Creates a {@link ViewConfigDescriptor} for the given inline view-config class
+ * @param viewDefinitionClass current view-config class
+ * @return descriptor which represents the view-config for the given config class
+ */
ViewConfigDescriptor extractInlineViewConfig(Class<? extends ViewConfig> viewDefinitionClass);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/action/CodiActionListener.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/action/CodiActionListener.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/action/CodiActionListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/action/CodiActionListener.java Sun Mar 27 14:36:40 2011
@@ -34,12 +34,19 @@ public class CodiActionListener implemen
private final ActionListener wrapped;
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link ActionListener}
+ * @param wrapped action-listener which should be wrapped
+ */
public CodiActionListener(ActionListener wrapped)
{
this.wrapped = wrapped;
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public void processAction(ActionEvent actionEvent)
{
if(this.deactivated)
@@ -60,6 +67,9 @@ public class CodiActionListener implemen
return new ViewControllerActionListener(viewConfigAwareNavigationHandler);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleFactoryWrapper.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/CodiLifecycleFactoryWrapper.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleFactoryWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/CodiLifecycleFactoryWrapper.java Sun Mar 27 14:36:40 2011
@@ -33,6 +33,10 @@ public class CodiLifecycleFactoryWrapper
private final LifecycleFactory wrapped;
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link LifecycleFactory}
+ * @param wrapped lifecycle-factory which should be wrapped
+ */
public CodiLifecycleFactoryWrapper(LifecycleFactory wrapped)
{
this.wrapped = wrapped;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.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/DefaultViewControllerStrategy.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/DefaultViewControllerStrategy.java Sun Mar 27 14:36:40 2011
@@ -39,6 +39,9 @@ public class DefaultViewControllerStrate
{
private static final long serialVersionUID = -4380864019324445036L;
+ /**
+ * {@inheritDoc}
+ */
public Object execute(InvocationContext invocationContext) throws Exception
{
Object result = null;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/PhaseListenerExtension.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/PhaseListenerExtension.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/PhaseListenerExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/PhaseListenerExtension.java Sun Mar 27 14:36:40 2011
@@ -54,6 +54,11 @@ public class PhaseListenerExtension impl
private static Map<ClassLoader, List<Class<? extends PhaseListener>>> phaseListeners =
new ConcurrentHashMap<ClassLoader,List<Class<? extends PhaseListener>>>();
+ /**
+ * Filters beans annotated with {@link JsfPhaseListener}.
+ * The class will be stored for consuming it later (see #consumePhaseListeners)
+ * @param processAnnotatedType current process-annotated-type
+ */
public void filterJsfPhaseListeners(@Observes ProcessAnnotatedType processAnnotatedType)
{
CodiStartupBroadcaster.broadcastStartup();
@@ -90,6 +95,11 @@ public class PhaseListenerExtension impl
phaseListenerClass.add(newPhaseListener);
}
+ /**
+ * Exposes the found phase-listeners for the invocation. Afterwards it will return an empty list.
+ * @return found phase-listeners for the first invocation,
+ * an empty list if there are no phase-listeners or if they are consumed already.
+ */
public static List<PhaseListener> consumePhaseListeners()
{
//workaround for mojarra
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.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/ViewControllerInterceptor.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/phase/ViewControllerInterceptor.java Sun Mar 27 14:36:40 2011
@@ -43,6 +43,12 @@ public class ViewControllerInterceptor i
@Inject
private ViewControllerStrategy viewControllerStrategy;
+ /**
+ * Alternative to view-controller configured via view-configs
+ * @param invocationContext current invocation-context
+ * @return result of the intercepted method
+ * @throws Exception exception which might be thrown by the intercepted method
+ */
@AroundInvoke
public Object filterPhaseListenerMethods(InvocationContext invocationContext) throws Exception
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.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/request/BeforeAfterFacesRequestBroadcaster.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.java Sun Mar 27 14:36:40 2011
@@ -38,11 +38,19 @@ public class BeforeAfterFacesRequestBroa
@AfterFacesRequest
private Event<FacesContext> afterFacesRequestEvent;
+ /**
+ * Broadcasts the {@link BeforeFacesRequest} event
+ * @param facesContext current faces-context
+ */
public void broadcastBeforeFacesRequestEvent(FacesContext facesContext)
{
this.beforeFacesRequestEvent.fire(facesContext);
}
+ /**
+ * Broadcasts the {@link AfterFacesRequest} event
+ * @param facesContext current faces-context
+ */
public void broadcastAfterFacesRequestEvent(FacesContext facesContext)
{
this.afterFacesRequestEvent.fire(facesContext);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.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/request/CodiFacesContextFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/CodiFacesContextFactory.java Sun Mar 27 14:36:40 2011
@@ -34,6 +34,10 @@ public class CodiFacesContextFactory ext
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link FacesContextFactory}
+ * @param wrappedFacesContextFactory wrapped faces-context-factory which should be used
+ */
public CodiFacesContextFactory(FacesContextFactory wrappedFacesContextFactory)
{
this.wrappedFacesContextFactory = wrappedFacesContextFactory;
@@ -68,6 +72,11 @@ public class CodiFacesContextFactory ext
return new CodiFacesContextWrapper(facesContext);
}
+ /**
+ * Allows to wrap the given {@link FacesContext} manually
+ * @param facesContext current faces-context
+ * @return the wrapped faces-context, or the given faces-context if it was wrapped already
+ */
public static FacesContext wrapFacesContext(FacesContext facesContext)
{
if(facesContext instanceof CodiFacesContextWrapper)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.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/request/FacesMessageEntry.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/request/FacesMessageEntry.java Sun Mar 27 14:36:40 2011
@@ -36,17 +36,30 @@ public class FacesMessageEntry implement
{
}
+ /**
+ * Constructor for creating the entry for the given component-id and {@link FacesMessage}
+ * @param componentId current component-id
+ * @param facesMessage current faces-message
+ */
public FacesMessageEntry(String componentId, FacesMessage facesMessage)
{
this.componentId = componentId;
this.facesMessage = facesMessage;
}
+ /**
+ * Returns the current component-id
+ * @return component-id of the entry
+ */
public String getComponentId()
{
return componentId;
}
+ /**
+ * Returns the current {@link FacesMessage}
+ * @return faces-message of the entry
+ */
public FacesMessage getFacesMessage()
{
return facesMessage;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/startup/ApplicationStartupBroadcaster.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/startup/ApplicationStartupBroadcaster.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/startup/ApplicationStartupBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/listener/startup/ApplicationStartupBroadcaster.java Sun Mar 27 14:36:40 2011
@@ -39,6 +39,9 @@ public class ApplicationStartupBroadcast
@Inject
private Event<JsfStartupEvent> applicationStartupEvent;
+ /**
+ * Broadcasts the {@link org.apache.myfaces.extensions.cdi.core.api.startup.event.StartupEvent}
+ */
public void broadcastStartupEvent()
{
if(initialized.containsKey(getClassLoader()))
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/FacesMessageInterpolator.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/message/FacesMessageInterpolator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/FacesMessageInterpolator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/FacesMessageInterpolator.java Sun Mar 27 14:36:40 2011
@@ -38,7 +38,7 @@ class FacesMessageInterpolator implement
private MessageInterpolator messageInterpolator;
- public FacesMessageInterpolator(ELProvider elProvider, ArgumentFilter argumentFilter)
+ FacesMessageInterpolator(ELProvider elProvider, ArgumentFilter argumentFilter)
{
if(elProvider != null)
{
@@ -54,6 +54,9 @@ class FacesMessageInterpolator implement
}
}
+ /**
+ * {@inheritDoc}
+ */
public String interpolate(MessageContext messageContext, String messageText, Serializable... arguments)
{
return this.messageInterpolator.interpolate(messageContext, messageText, arguments);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.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/message/JsfAwareApplicationMessagesMessageResolver.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareApplicationMessagesMessageResolver.java Sun Mar 27 14:36:40 2011
@@ -35,6 +35,9 @@ class JsfAwareApplicationMessagesMessage
{
private static final long serialVersionUID = 4646223879356055470L;
+ /**
+ * {@inheritDoc}
+ */
public String getMessage(MessageContext messageContext,
String messageDescriptor,
Map<Class, MessagePayload> messagePayload)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareLocaleResolver.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/message/JsfAwareLocaleResolver.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareLocaleResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareLocaleResolver.java Sun Mar 27 14:36:40 2011
@@ -30,6 +30,9 @@ public class JsfAwareLocaleResolver impl
{
private static final long serialVersionUID = 5945811297524654438L;
+ /**
+ * {@inheritDoc}
+ */
public Locale getLocale()
{
Locale locale = null;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.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/message/JsfAwareMessageContextProducer.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageContextProducer.java Sun Mar 27 14:36:40 2011
@@ -38,6 +38,14 @@ import javax.inject.Named;
@ApplicationScoped
public class JsfAwareMessageContextProducer
{
+ /**
+ * Creates a specialized {@link MessageContext} for JSF which delegates to jsf mechanisms (as fallback)
+ * @param defaultMessageContext pre-configured message-context
+ * @param messageFactoryInstance current message-factory (optional)
+ * @param elProviderInstance current el-provider (optional)
+ * @param argumentFilterInstance current argument-filter (optional)
+ * @return optimized message-context for jsf-applications
+ */
@Produces
@Dependent
@Jsf
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.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/message/JsfAwareMessageHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/message/JsfAwareMessageHandler.java Sun Mar 27 14:36:40 2011
@@ -45,6 +45,9 @@ class JsfAwareMessageHandler extends Abs
private boolean projectStageDevelopment;
+ /**
+ * {@inheritDoc}
+ */
@Override
protected void processMessage(MessageContext messageContext, Message message)
{
@@ -121,16 +124,25 @@ class JsfAwareMessageHandler extends Abs
throw new IllegalArgumentException(payload.getClass().getName());
}
+ /**
+ * {@inheritDoc}
+ */
public void removeMessage(Message message)
{
throw new UnsupportedOperationException("not implemented");
}
+ /**
+ * {@inheritDoc}
+ */
public void removeAllMessages()
{
throw new UnsupportedOperationException("not implemented");
}
+ /**
+ * {@inheritDoc}
+ */
public List<Message> getMessages()
{
throw new UnsupportedOperationException("not implemented");
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.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/AccessScopeAwareNavigationHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java Sun Mar 27 14:36:40 2011
@@ -33,11 +33,18 @@ public class AccessScopeAwareNavigationH
{
private final NavigationHandler navigationHandler;
+ /**
+ * Constructor for wrapping the given {@link NavigationHandler}
+ * @param navigationHandler navigation-handler which should be wrapped
+ */
public AccessScopeAwareNavigationHandler(NavigationHandler navigationHandler)
{
this.navigationHandler = navigationHandler;
}
+ /**
+ * {@inheritDoc}
+ */
public void handleNavigation(FacesContext facesContext, String s, String s1)
{
//we have to reset it due to possible redirects
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/CodiNavigationHandler.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/CodiNavigationHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/CodiNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/CodiNavigationHandler.java Sun Mar 27 14:36:40 2011
@@ -35,6 +35,10 @@ public class CodiNavigationHandler exten
private final NavigationHandler originalNavigationHandler;
+ /**
+ * Constructor for wrapping the given {@link NavigationHandler}
+ * @param navigationHandler navigation-handler which should be wrapped
+ */
public CodiNavigationHandler(NavigationHandler navigationHandler)
{
if(isActivated())
@@ -51,6 +55,9 @@ public class CodiNavigationHandler exten
this.originalNavigationHandler = navigationHandler;
}
+ /**
+ * {@inheritDoc}
+ */
public void handleNavigation(FacesContext context, String fromAction, String outcome)
{
if(context.getResponseComplete() /*see EXTCDI-92*/)
@@ -63,6 +70,9 @@ public class CodiNavigationHandler exten
}
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/DefaultViewNavigationHandler.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/DefaultViewNavigationHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/DefaultViewNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/DefaultViewNavigationHandler.java Sun Mar 27 14:36:40 2011
@@ -30,6 +30,9 @@ import javax.faces.context.FacesContext;
@ApplicationScoped
public class DefaultViewNavigationHandler implements ViewNavigationHandler
{
+ /**
+ * {@inheritDoc}
+ */
public void navigateTo(Class<? extends ViewConfig> targetView)
{
FacesContext facesContext = FacesContext.getCurrentInstance();
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -54,14 +54,19 @@ public class ViewConfigAwareNavigationHa
private Map<String, ViewConfigDescriptor> viewConfigs = new ConcurrentHashMap<String, ViewConfigDescriptor>();
private NavigationHandler navigationHandler;
- private boolean delegateCall;
+ private boolean implicitNavigationSupported;
private BeanManager beanManager;
- public ViewConfigAwareNavigationHandler(NavigationHandler navigationHandler, boolean delegateCall)
+ /**
+ * Constructor which allows to use the given {@link NavigationHandler}
+ * @param navigationHandler navigation-handler of jsf
+ * @param implicitNavigationSupported true in case of jsf2+ and false in case of jsf1.2
+ */
+ public ViewConfigAwareNavigationHandler(NavigationHandler navigationHandler, boolean implicitNavigationSupported)
{
this.navigationHandler = navigationHandler;
- this.delegateCall = delegateCall;
+ this.implicitNavigationSupported = implicitNavigationSupported;
}
//Security checks will be performed by the view-handler provided by codi
@@ -114,8 +119,9 @@ public class ViewConfigAwareNavigationHa
entry = tryToUpdateEntry(entry, navigateEvent);
- if(entry != null && !this.delegateCall) //entry might be null after the update
+ if(entry != null && !this.implicitNavigationSupported) //entry might be null after the update
{
+ //jsf1.2
processViewDefinitionEntry(facesContext, entry);
//just to invoke all other nav handlers if they have to perform special tasks...
@@ -124,6 +130,7 @@ public class ViewConfigAwareNavigationHa
}
else if(entry != null)
{
+ //jsf2+
outcome = convertEntryToOutcome(facesContext.getExternalContext(), entry);
}
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/request/DefaultRequestTypeResolver.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/request/DefaultRequestTypeResolver.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/request/DefaultRequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/request/DefaultRequestTypeResolver.java Sun Mar 27 14:36:40 2011
@@ -35,6 +35,9 @@ public class DefaultRequestTypeResolver
{
private static final long serialVersionUID = -3702446693324781260L;
+ /**
+ * {@inheritDoc}
+ */
protected RequestTypeResolver createDefaultRequestTypeResolver()
{
return new RequestTypeResolver()
@@ -60,11 +63,17 @@ public class DefaultRequestTypeResolver
this.postRequest = renderKit.getResponseStateManager().isPostback(facesContext);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isPartialRequest()
{
return false;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isPostRequest()
{
return this.postRequest;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/CodiRenderKitFactory.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/CodiRenderKitFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/CodiRenderKitFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/CodiRenderKitFactory.java Sun Mar 27 14:36:40 2011
@@ -42,6 +42,10 @@ public class CodiRenderKitFactory extend
private volatile Boolean initialized;
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link RenderKitFactory}
+ * @param wrapped render-kit-factory which will be wrapped
+ */
public CodiRenderKitFactory(RenderKitFactory wrapped)
{
this.wrapped = wrapped;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ConversationAware.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/ConversationAware.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ConversationAware.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ConversationAware.java Sun Mar 27 14:36:40 2011
@@ -25,5 +25,9 @@ import org.apache.myfaces.extensions.cdi
*/
interface ConversationAware
{
+ /**
+ * Allows to inject the current conversation without reflection
+ * @param conversation current conversation
+ */
void setConversation(Conversation conversation);
}
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -50,6 +50,15 @@ public class DefaultConversation impleme
private final boolean closeConversationEventEnable;
private final boolean restartConversationEventEnable;
+ /**
+ * Constructor which creates a conversation for the given
+ * {@link ConversationKey}, {@link ConversationExpirationEvaluator}, {@link ConversationConfig}
+ * and {@link BeanManager}
+ * @param conversationKey key of the current conversation
+ * @param expirationEvaluator expiration strategy which decides if the current conversation is expired
+ * @param conversationConfig current conversation-config
+ * @param beanManager current bean-manager
+ */
public DefaultConversation(ConversationKey conversationKey,
ConversationExpirationEvaluator expirationEvaluator,
ConversationConfig conversationConfig,
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/DefaultWindowContextManager.java Sun Mar 27 14:36:40 2011
@@ -146,7 +146,7 @@ public class DefaultWindowContextManager
ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
- if(this.windowContextQuotaHandler.checkQuota(getNumberOfNextWindowContext()))
+ if(this.windowContextQuotaHandler.isWindowContextQuotaViolated(getNumberOfNextWindowContext()))
{
//handle violation if cleanup is deactivated or the cleanup wasn't successful
if(!this.windowContextConfig.isCloseEmptyWindowContextsEnabled() || !cleanupInactiveWindowContexts(this))
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -41,10 +41,18 @@ public class DefaultWindowContextQuotaHa
private int maxWindowContextCount;
+ /**
+ * Default constructor required by proxy libs
+ */
public DefaultWindowContextQuotaHandler()
{
}
+ /**
+ * Constructor used by the container for creating the {@link WindowContextQuotaHandler} based on the given
+ * {@link WindowContextConfig}
+ * @param windowContextConfig current window-context-config
+ */
@Inject
public DefaultWindowContextQuotaHandler(WindowContextConfig windowContextConfig)
{
@@ -54,7 +62,7 @@ public class DefaultWindowContextQuotaHa
/**
* {@inheritDoc}
*/
- public boolean checkQuota(int activeWindowContextCount)
+ public boolean isWindowContextQuotaViolated(int activeWindowContextCount)
{
return this.maxWindowContextCount < activeWindowContextCount;
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.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/GroupedConversationContextExtension.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/GroupedConversationContextExtension.java Sun Mar 27 14:36:40 2011
@@ -18,6 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation;
+import org.apache.myfaces.extensions.cdi.core.api.Deactivatable;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ConversationScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.ViewAccessScoped;
@@ -41,8 +42,13 @@ import java.util.Set;
*
* @author Gerhard Petracek
*/
-public class GroupedConversationContextExtension implements Extension
+public class GroupedConversationContextExtension implements Extension, Deactivatable
{
+ /**
+ * Adds codi scopes to the container
+ * @param event after-bean-discovery event
+ * @param manager current bean-manager
+ */
public void afterBeanDiscovery(@Observes AfterBeanDiscovery event, BeanManager manager)
{
if(!isActivated())
@@ -58,6 +64,10 @@ public class GroupedConversationContextE
event.addContext(new ConversationContextAdapter(ViewAccessScoped.class, codiConversationContext));
}
+ /**
+ * Validates the correct usage of codi scopes.
+ * @param processBean current process-bean
+ */
@SuppressWarnings({"ThrowableInstanceNeverThrown"})
public void validateScopes(@Observes ProcessBean processBean)
{
@@ -91,6 +101,9 @@ public class GroupedConversationContextE
}
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InterceptedResponseWriter.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/InterceptedResponseWriter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InterceptedResponseWriter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/InterceptedResponseWriter.java Sun Mar 27 14:36:40 2011
@@ -36,6 +36,10 @@ public class InterceptedResponseWriter e
{
private ResponseWriter wrapped;
+ /**
+ * Constructor for wrapping the given {@link ResponseWriter}
+ * @param wrapped response-writer which should be wrapped
+ */
public InterceptedResponseWriter(ResponseWriter wrapped)
{
this.wrapped = wrapped;
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -47,6 +47,10 @@ public class RedirectedConversationAware
private boolean encodeActionURLs;
+ /**
+ * Constructor for wrapping the given {@link ExternalContext}
+ * @param wrapped external-context which should be wrapped
+ */
public RedirectedConversationAwareExternalContext(ExternalContext wrapped)
{
this.wrapped = wrapped;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.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/TimeoutExpirationEvaluator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/TimeoutExpirationEvaluator.java Sun Mar 27 14:36:40 2011
@@ -22,8 +22,14 @@ import java.util.Date;
import java.io.Serializable;
/**
+ * Base implementation which doesn't implement the {@link ConversationExpirationEvaluator} interface because
+ * this implementation will be used by the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowContext} but
+ * there is no need for implementing the whole {@link ConversationExpirationEvaluator} interface.
+ *
* @author Gerhard Petracek
*/
+//TODO re-visit it
public class TimeoutExpirationEvaluator implements Serializable
{
private static final long serialVersionUID = -1132091879142732148L;
@@ -37,12 +43,19 @@ public class TimeoutExpirationEvaluator
this.timeoutInMs = timeoutInMinutes * 60000;
}
+ /**
+ * Evaluates if the conversation is still valid
+ * @return false if the conversation is valid, true otherwise
+ */
public boolean isExpired()
{
return this.lastAccess == null ||
(this.lastAccess.getTime() + this.timeoutInMs) < System.currentTimeMillis();
}
+ /**
+ * Marks the conversation as used
+ */
public void touch()
{
this.lastAccess = new Date();
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.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/ViewAccessConversationExpirationEvaluatorRegistry.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/ViewAccessConversationExpirationEvaluatorRegistry.java Sun Mar 27 14:36:40 2011
@@ -53,6 +53,10 @@ public class ViewAccessConversationExpir
this.viewAccessConversationExpirationEvaluatorList.add(evaluator);
}
+ /**
+ * Notifies all {@link ViewAccessConversationExpirationEvaluator}s about the rendered view
+ * @param viewId current view-id
+ */
public void broadcastRenderedViewId(String viewId)
{
for(ViewAccessConversationExpirationEvaluator evaluator : this.viewAccessConversationExpirationEvaluatorList)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextAwareViewHandler.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/WindowContextAwareViewHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextAwareViewHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextAwareViewHandler.java Sun Mar 27 14:36:40 2011
@@ -45,17 +45,27 @@ public class WindowContextAwareViewHandl
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link ViewHandler}
+ * @param wrapped view-handler which should be wrapped
+ */
public WindowContextAwareViewHandler(ViewHandler wrapped)
{
this.wrapped = wrapped;
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public ViewHandler getWrapped()
{
return this.wrapped;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String getActionURL(FacesContext context, String viewId)
{
@@ -89,6 +99,9 @@ public class WindowContextAwareViewHandl
}
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public UIViewRoot restoreView(FacesContext facesContext, String viewId)
{
@@ -111,6 +124,9 @@ public class WindowContextAwareViewHandl
return this.wrapped.restoreView(facesContext, viewId);
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextIdHolderComponent.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/WindowContextIdHolderComponent.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextIdHolderComponent.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowContextIdHolderComponent.java Sun Mar 27 14:36:40 2011
@@ -30,17 +30,26 @@ public class WindowContextIdHolderCompon
{
private String windowContextId;
+ /**
+ * Default constructor might be invoked by the jsf implementation
+ */
@SuppressWarnings({"UnusedDeclaration"})
public WindowContextIdHolderComponent()
{
}
+ /**
+ * Constructor which creates the holder for the given window-id
+ * @param windowContextId current window-id
+ */
public WindowContextIdHolderComponent(String windowContextId)
{
this.windowContextId = windowContextId;
}
-
+ /**
+ * {@inheritDoc}
+ */
public Object saveState(FacesContext facesContext)
{
Object[] values = new Object[2];
@@ -49,6 +58,9 @@ public class WindowContextIdHolderCompon
return values;
}
+ /**
+ * {@inheritDoc}
+ */
public void restoreState(FacesContext facesContext, Object state)
{
if (state == null)
@@ -66,6 +78,10 @@ public class WindowContextIdHolderCompon
.put(WindowContextManager.WINDOW_CONTEXT_ID_PARAMETER_KEY, this.windowContextId);
}
+ /**
+ * Exposes the stored window-id
+ * @return current window-id
+ */
public String getWindowContextId()
{
return windowContextId;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.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/WindowConversationExpirationEvaluator.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/WindowConversationExpirationEvaluator.java Sun Mar 27 14:36:40 2011
@@ -25,16 +25,25 @@ class WindowConversationExpirationEvalua
{
private static final long serialVersionUID = 6646005969384698897L;
+ /**
+ * {@inheritDoc}
+ */
public boolean isExpired()
{
return false;
}
+ /**
+ * {@inheritDoc}
+ */
public void touch()
{
//not needed
}
+ /**
+ * {@inheritDoc}
+ */
public void expire()
{
//isn't supported
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationFactory.java Sun Mar 27 14:36:40 2011
@@ -27,5 +27,11 @@ import java.io.Serializable;
*/
public interface ConversationFactory extends Serializable
{
+ /**
+ * Creates an {@link EditableConversation} for the given {@link ConversationKey} and {@link ConversationConfig}
+ * @param conversationKey current conversation-key
+ * @param config current conversation-config
+ * @return created conversation
+ */
EditableConversation createConversation(ConversationKey conversationKey, ConversationConfig config);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationKey.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationKey.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationKey.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/ConversationKey.java Sun Mar 27 14:36:40 2011
@@ -27,9 +27,21 @@ import java.io.Serializable;
*/
public interface ConversationKey extends Serializable
{
+ /**
+ * Annotation class of the scope annotation
+ * @return scope annotation-class
+ */
Class<? extends Annotation> getScope();
+ /**
+ * Class of the group of the conversation
+ * @return current conversation-group
+ */
Class<?> getConversationGroup();
+ /**
+ * CDI qualifiers without the conversation group
+ * @return qualifiers for the conversation
+ */
Set<Annotation> getQualifiers();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableConversation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableConversation.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableConversation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableConversation.java Sun Mar 27 14:36:40 2011
@@ -42,6 +42,11 @@ public interface EditableConversation ex
*/
void deactivate();
+ /**
+ * Adds a {@link BeanEntry} which represents a scoped bean to the current conversation
+ * @param beanInstance bean instance which should be added to the conversation
+ * @param <T> tpye of the bean
+ */
<T> void addBean(BeanEntry<T> beanInstance);
/**
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContext.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContext.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/EditableWindowContext.java Sun Mar 27 14:36:40 2011
@@ -34,10 +34,20 @@ public interface EditableWindowContext e
*/
boolean isActive();
+ /**
+ * Date of the last access of the whole {@link WindowContext}
+ * @return date of the last access
+ */
Date getLastAccess();
+ /**
+ * Signals that the {@link WindowContext} gets used
+ */
void touch();
+ /**
+ * Removes conversations which are already marked as expired
+ */
void removeInactiveConversations();
/**
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/LifecycleAwareWindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/LifecycleAwareWindowHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/LifecycleAwareWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/LifecycleAwareWindowHandler.java Sun Mar 27 14:36:40 2011
@@ -27,12 +27,11 @@ import javax.faces.context.FacesContext;
*/
public interface LifecycleAwareWindowHandler extends WindowHandler
{
-
/**
* Is called before the execute portion of the JSF lifecycle starts.
* If this method sets responseComplete() to true, the lifecycle won't be started.
*
- * @param facesContext
+ * @param facesContext current faces-context
*/
void beforeLifecycleExecute(FacesContext facesContext);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextFactory.java Sun Mar 27 14:36:40 2011
@@ -26,6 +26,14 @@ import org.apache.myfaces.extensions.cdi
*/
public interface WindowContextFactory
{
+ /**
+ * Creates an {@link EditableWindowContext} for the given
+ * window-id, {@link WindowContextConfig} and {@link ConversationConfig}
+ * @param windowContextId current window-id
+ * @param windowContextConfig current window-context-config
+ * @param conversationConfig current conversation-config
+ * @return context for the current window or tab
+ */
EditableWindowContext createWindowContext(String windowContextId,
WindowContextConfig windowContextConfig,
ConversationConfig conversationConfig);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextManagerFactory.java Sun Mar 27 14:36:40 2011
@@ -26,6 +26,13 @@ import org.apache.myfaces.extensions.cdi
*/
public interface WindowContextManagerFactory
{
+ /**
+ * Creates a {@link EditableWindowContextManager} based on the given {@link WindowContextConfig} and
+ * {@link ConversationConfig}
+ * @param windowContextConfig current window-context-config
+ * @param conversationConfig current conversation-config
+ * @return window-context-manager for the current user(-session)
+ */
EditableWindowContextManager createWindowContextManager(WindowContextConfig windowContextConfig,
ConversationConfig conversationConfig);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/spi/WindowContextQuotaHandler.java Sun Mar 27 14:36:40 2011
@@ -25,7 +25,15 @@ import java.io.Serializable;
*/
public interface WindowContextQuotaHandler extends Serializable
{
- boolean checkQuota(int activeWindowContextCount);
+ /**
+ * Checks if the count of the currently active window-contexts is too high
+ * @param activeWindowContextCount current window-context count
+ * @return true if the count is too high and a cleanup has to be triggered, false otherwise
+ */
+ boolean isWindowContextQuotaViolated(int activeWindowContextCount);
+ /**
+ * Handles a quota violation if #checkQuota returned true and the cleanup couldn't remove an old context
+ */
void handleQuotaViolation();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/DefaultSecurityStrategy.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/DefaultSecurityStrategy.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/DefaultSecurityStrategy.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/DefaultSecurityStrategy.java Sun Mar 27 14:36:40 2011
@@ -42,6 +42,9 @@ public class DefaultSecurityStrategy imp
@Inject
private BeanManager beanManager;
+ /**
+ * {@inheritDoc}
+ */
public Object execute(InvocationContext invocationContext) throws Exception
{
Secured secured = getSecuredAnnotation(invocationContext);
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.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/SecurityAwareViewHandler.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityAwareViewHandler.java Sun Mar 27 14:36:40 2011
@@ -50,17 +50,27 @@ public class SecurityAwareViewHandler ex
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link ViewHandler}
+ * @param wrapped view-handler which should be wrapped
+ */
public SecurityAwareViewHandler(ViewHandler wrapped)
{
this.wrapped = wrapped;
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public ViewHandler getWrapped()
{
return this.wrapped;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public UIViewRoot createView(FacesContext context, String viewId)
{
@@ -129,6 +139,9 @@ public class SecurityAwareViewHandler ex
}
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -42,6 +42,12 @@ public class SecurityInterceptor impleme
@Inject
private SecurityStrategy securityStrategy;
+ /**
+ * Triggers the registered {@link AccessDecisionVoter}s
+ * @param invocationContext current invocation-context
+ * @return result of the intercepted method
+ * @throws Exception exception which might be thrown by the intercepted method
+ */
@AroundInvoke
public Object filterDeniedInvocations(InvocationContext invocationContext) throws Exception
{
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=1085945&r1=1085944&r2=1085945&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 Sun Mar 27 14:36:40 2011
@@ -45,6 +45,13 @@ public class SecurityViewListener
{
private static final String LAZY_SECURITY_CHECK_KEY = "LAZY_SECURITY_CHECK";
+ /**
+ * Checks the permission based on the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.security.AccessDecisionVoter}s
+ * which are configured for the current view.
+ * @param event current phase-event
+ * @param beanManager current bean-manager
+ */
public void checkPermission(@Observes @AfterPhase(RESTORE_VIEW) PhaseEvent event, BeanManager beanManager)
{
FacesContext facesContext = event.getFacesContext();
@@ -58,6 +65,13 @@ public class SecurityViewListener
checkPermission(beanManager, facesContext);
}
+ /**
+ * Checks the permission based on the
+ * {@link org.apache.myfaces.extensions.cdi.core.api.security.AccessDecisionVoter}s
+ * which are configured for the current view.
+ * @param event current phase-event
+ * @param beanManager current bean-manager
+ */
public void checkPermissionBeforeRendering(
@Observes @BeforePhase(RENDER_RESPONSE) PhaseEvent event, BeanManager beanManager)
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViolationAwareActionListener.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/SecurityViolationAwareActionListener.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViolationAwareActionListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/security/SecurityViolationAwareActionListener.java Sun Mar 27 14:36:40 2011
@@ -35,12 +35,19 @@ public class SecurityViolationAwareActio
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link ActionListener}
+ * @param wrapped action-listener which should be wrapped
+ */
public SecurityViolationAwareActionListener(ActionListener wrapped)
{
this.wrapped = wrapped;
this.deactivated = !isActivated();
}
+ /**
+ * {@inheritDoc}
+ */
public void processAction(ActionEvent actionEvent)
{
try
@@ -58,8 +65,12 @@ public class SecurityViolationAwareActio
}
}
+ /**
+ * {@inheritDoc}
+ */
public boolean isActivated()
{
return ClassDeactivation.isClassActivated(getClass());
}
+
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/RequestParameter.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/RequestParameter.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/RequestParameter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/RequestParameter.java Sun Mar 27 14:36:40 2011
@@ -29,22 +29,39 @@ public class RequestParameter
private final String key;
private final String[] values;
+ /**
+ * Constructor for creating a parameter for the given key and values
+ * @param key current key
+ * @param values current values
+ */
public RequestParameter(String key, String[] values)
{
this.key = key;
this.values = values;
}
+ /**
+ * Key of the parameter
+ * @return current key
+ */
public String getKey()
{
return key;
}
+ /**
+ * Exposes the values of the parameter as list
+ * @return values of the parameter
+ */
public List<String> getValueList()
{
return Arrays.asList(this.values);
}
+ /**
+ * Exposes the values of the parameter as array
+ * @return values of the parameter
+ */
public String[] getValues()
{
return values;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.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/SecurityUtils.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/SecurityUtils.java Sun Mar 27 14:36:40 2011
@@ -43,6 +43,9 @@ public abstract class SecurityUtils
{
private static final Jsf JSF_QUALIFIER = DefaultAnnotation.of(Jsf.class);
+ /**
+ * Constructor which prevents the instantiation of this class
+ */
private SecurityUtils()
{
// prevent instantiation
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleFactoryWrapper.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/phase/CodiLifecycleFactoryWrapper.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleFactoryWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/phase/CodiLifecycleFactoryWrapper.java Sun Mar 27 14:36:40 2011
@@ -35,6 +35,10 @@ public class CodiLifecycleFactoryWrapper
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link LifecycleFactory}
+ * @param wrapped lifecycle-factory which should be wrapped
+ */
public CodiLifecycleFactoryWrapper(LifecycleFactory wrapped)
{
this.wrapped = wrapped;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.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/request/CodiFacesContextFactory.java?rev=1085945&r1=1085944&r2=1085945&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/listener/request/CodiFacesContextFactory.java Sun Mar 27 14:36:40 2011
@@ -34,6 +34,10 @@ public class CodiFacesContextFactory ext
private final boolean deactivated;
+ /**
+ * Constructor for wrapping the given {@link FacesContextFactory}
+ * @param wrappedFacesContextFactory wrapped faces-context-factory which should be used
+ */
public CodiFacesContextFactory(FacesContextFactory wrappedFacesContextFactory)
{
this.wrappedFacesContextFactory = wrappedFacesContextFactory;
@@ -76,6 +80,11 @@ public class CodiFacesContextFactory ext
return wrappedFacesContextFactory.getWrapped();
}
+ /**
+ * Allows to wrap the given {@link FacesContext} manually
+ * @param facesContext current faces-context
+ * @return the wrapped faces-context, or the given faces-context if it was wrapped already
+ */
public static FacesContext wrapFacesContext(FacesContext facesContext)
{
if(facesContext instanceof CodiFacesContextWrapper)