You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/11/02 11:52:47 UTC
svn commit: r1029998 - in /myfaces/extensions/cdi/trunk:
examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/
jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/
jee-m...
Author: gpetracek
Date: Tue Nov 2 10:52:42 2010
New Revision: 1029998
URL: http://svn.apache.org/viewvc?rev=1029998&view=rev
Log:
cleanup and basic javadoc for api modules
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/JsfViewExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/NavigationMode.java
Modified:
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DemoPages.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DeniedPage.java
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/Login.java
myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/Jsf.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/JsfModuleBeanNames.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/InitView.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PrePageAction.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreRenderView.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreViewConfigNavigateEvent.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/AfterPhase.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/BeforePhase.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfLifecyclePhaseInformation.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseListener.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/AfterFacesRequest.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/BeforeFacesRequest.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigExtension.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding1.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding2.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DemoPages.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DemoPages.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DemoPages.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DemoPages.java Tue Nov 2 10:52:42 2010
@@ -21,15 +21,14 @@ package org.apache.myfaces.examples.codi
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageBean;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.JsfViewExtension;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
+import static org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode.FORWARD;
import org.apache.myfaces.examples.codi.jsf12.conversation.grouped.ConversationDemoBean1;
/**
* @author Gerhard Petracek
*/
@Page(basePath = "" /*override default to ignore path level*/,
- navigation = NavigationMode.REDIRECT, extension = JsfViewExtension.JSP)
+ navigation = Page.NavigationMode.REDIRECT, extension = Page.Extension.JSP)
public abstract class DemoPages implements ViewConfig
{
@PageBean(ConversationDemoBean1.class) //triggers e.g. @PostConstruct before the rendering process (if needed)
@@ -46,7 +45,7 @@ public abstract class DemoPages implemen
}
@ViewMode(readOnly = true) //custom view meta-data
- @Page(basePath = ".", navigation = NavigationMode.FORWARD)
+ @Page(basePath = ".", navigation = FORWARD)
public final class HelloMyFacesCodi2 extends DemoPages
{
}
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DeniedPage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DeniedPage.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DeniedPage.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/DeniedPage.java Tue Nov 2 10:52:42 2010
@@ -21,7 +21,7 @@ package org.apache.myfaces.examples.codi
import org.apache.myfaces.extensions.cdi.core.api.security.Secured;
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
-import static org.apache.myfaces.extensions.cdi.jsf.api.config.view.JsfViewExtension.JSP;
+import static org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.Extension.JSP;
import org.apache.myfaces.examples.codi.jsf12.security.ForcedViolationVoter;
/**
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/Login.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/Login.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/Login.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/examples/codi/jsf12/view/Login.java Tue Nov 2 10:52:42 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.examples.codi
import org.apache.myfaces.extensions.cdi.core.api.security.DefaultErrorView;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
-import static org.apache.myfaces.extensions.cdi.jsf.api.config.view.JsfViewExtension.JSP;
+import static org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.Extension.JSP;
/**
* @author Gerhard Petracek
Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/Transactional.java Tue Nov 2 10:52:42 2010
@@ -28,6 +28,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+/**
+ * If it isn't possible to use EJBs, this interceptor adds transaction support to methods or a class.
+ * The optional qualifier can be used to specify different entity managers.
+ */
+
@InterceptorBinding
@Documented
@Inherited
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/ConfigParameter.java Tue Nov 2 10:52:42 2010
@@ -21,6 +21,8 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.CoreCodiConfigParameter;
/**
+ * (web.xml) config params and the default values for the parameters.
+ *
* @author Gerhard Petracek
*/
public interface ConfigParameter
@@ -42,9 +44,11 @@ public interface ConfigParameter
static final boolean ALLOW_UNKNOWN_WINDOW_IDS_DEFAULT = false;
+ @Deprecated
static final String ADD_WINDOW_ID_TO_ACTION_URL_ENABLED =
CoreCodiConfigParameter.BASE_NAME + "ADD_WINDOW_ID_TO_ACTION_URL_ENABLED";
+ @Deprecated
static final boolean ADD_WINDOW_ID_TO_ACTION_URL_ENABLED_DEFAULT = false;
static final String DISABLE_INITIAL_REDIRECT =
@@ -67,6 +71,9 @@ public interface ConfigParameter
static final int MAX_WINDOW_CONTEXT_COUNT_DEFAULT = 64;
+ /*
+ * event config
+ */
static final String ENABLE_SCOPE_BEAN_EVENT =
CoreCodiConfigParameter.BASE_NAME + "ENABLE_SCOPE_BEAN_EVENT";
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/Jsf.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/Jsf.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/Jsf.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/Jsf.java Tue Nov 2 10:52:42 2010
@@ -26,6 +26,8 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Target;
/**
+ * Qualifier for producing artifacts which are improved for the usage in combination with JSF
+ *
* @author Gerhard Petracek
*/
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/JsfModuleBeanNames.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/JsfModuleBeanNames.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/JsfModuleBeanNames.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/JsfModuleBeanNames.java Tue Nov 2 10:52:42 2010
@@ -21,6 +21,8 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.BeanNames;
/**
+ * Contains all bean names provided by this module
+ *
* @author Gerhard Petracek
*/
public interface JsfModuleBeanNames extends BeanNames
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/InitView.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/InitView.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/InitView.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/InitView.java Tue Nov 2 10:52:42 2010
@@ -25,6 +25,9 @@ import static java.lang.annotation.Reten
import static java.lang.annotation.ElementType.METHOD;
/**
+ * View-controller annotation for page-beans.
+ * Methods annotated with this annotation will be invoked as soon as a view has been initialized.
+ *
* @author Gerhard Petracek
*/
@Target(METHOD)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/Page.java Tue Nov 2 10:52:42 2010
@@ -27,6 +27,8 @@ import static java.lang.annotation.Eleme
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
+ * Stereotype for marking a class as page for type-safe view-configs.
+ *
* @author Gerhard Petracek
*/
@Stereotype
@@ -42,8 +44,21 @@ public @interface Page
String name() default "";
//TODO config for default extension
- String extension() default JsfViewExtension.XHTML;
+ String extension() default Extension.XHTML;
//TODO config for default navigation mode
NavigationMode navigation() default NavigationMode.DEFAULT;
+
+ public interface Extension
+ {
+ String XHTML = "xhtml";
+ String JSF = "jsf";
+ String FACES = "faces";
+ String JSP = "jsp";
+ }
+
+ public enum NavigationMode
+ {
+ DEFAULT, FORWARD, REDIRECT
+ }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageBean.java Tue Nov 2 10:52:42 2010
@@ -27,6 +27,9 @@ import static java.lang.annotation.Eleme
import static java.lang.annotation.RetentionPolicy.RUNTIME;
/**
+ * Specifies one or more page-beans via the type-safe view-config.
+ * Such page beans support e.g. the view-controller annotations.
+ *
* @author Gerhard Petracek
*/
@Stereotype
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PrePageAction.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PrePageAction.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PrePageAction.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PrePageAction.java Tue Nov 2 10:52:42 2010
@@ -25,6 +25,9 @@ import static java.lang.annotation.Reten
import static java.lang.annotation.ElementType.METHOD;
/**
+ * View-controller annotation for page-beans.
+ * Methods annotated with this annotation will be invoked before the method binding gets invoked.
+ *
* @author Gerhard Petracek
*/
@Target(METHOD)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreRenderView.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreRenderView.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreRenderView.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreRenderView.java Tue Nov 2 10:52:42 2010
@@ -25,6 +25,9 @@ import static java.lang.annotation.Reten
import static java.lang.annotation.ElementType.METHOD;
/**
+ * View-controller annotation for page-beans.
+ * Methods annotated with this annotation will be invoked before the view gets rendered.
+ *
* @author Gerhard Petracek
*/
@Target(METHOD)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreViewConfigNavigateEvent.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreViewConfigNavigateEvent.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreViewConfigNavigateEvent.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PreViewConfigNavigateEvent.java Tue Nov 2 10:52:42 2010
@@ -21,6 +21,9 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
/**
+ * Event will be fired before the navigation (from and to a view-config based page) occurs.
+ * With {@link #navigateTo(Class)} it's possible to change the navigation target.
+ *
* @author Gerhard Petracek
*/
public class PreViewConfigNavigateEvent
@@ -34,16 +37,31 @@ public class PreViewConfigNavigateEvent
this.toView = toView;
}
+ /**
+ * Provides the navigation source.
+ *
+ * @return source of the navigation
+ */
public Class<? extends ViewConfig> getFromView()
{
return fromView;
}
+ /**
+ * Provides the navigation target.
+ *
+ * @return target of the navigation
+ */
public Class<? extends ViewConfig> getToView()
{
return toView;
}
+ /**
+ * Allows to change the navigation target.
+ *
+ * @param toView new navigation target
+ */
public void navigateTo(Class<? extends ViewConfig> toView)
{
this.toView = toView;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/AfterPhase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/AfterPhase.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/AfterPhase.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/AfterPhase.java Tue Nov 2 10:52:42 2010
@@ -40,6 +40,8 @@ import java.lang.annotation.Target;
/**
* - for phase-observer-methods
* - for lifecycle callbacks in view-definitions
+ *
+ * Parameter-type of the observer: {@link javax.faces.event.PhaseEvent}
*/
public @interface AfterPhase
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/BeforePhase.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/BeforePhase.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/BeforePhase.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/BeforePhase.java Tue Nov 2 10:52:42 2010
@@ -40,6 +40,8 @@ import java.lang.annotation.Target;
/**
* - for phase-observer-methods
* - for lifecycle callbacks in view-definitions
+ *
+ * Parameter-type of the observer: {@link javax.faces.event.PhaseEvent}
*/
public @interface BeforePhase
{
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfLifecyclePhaseInformation.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfLifecyclePhaseInformation.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfLifecyclePhaseInformation.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfLifecyclePhaseInformation.java Tue Nov 2 10:52:42 2010
@@ -19,6 +19,8 @@
package org.apache.myfaces.extensions.cdi.jsf.api.listener.phase;
/**
+ * Allows to detect the current request-lifecycle-phase in a bean.
+ *
* @author Gerhard Petracek
*/
public interface JsfLifecyclePhaseInformation
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseListener.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/phase/JsfPhaseListener.java Tue Nov 2 10:52:42 2010
@@ -26,6 +26,10 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Target;
/**
+ * Annotation for implementations of {@link javax.faces.event.PhaseListener}.
+ * Use {@link org.apache.myfaces.extensions.cdi.core.api.InvocationOrder} if it is required to specify the order
+ * of your {@link javax.faces.event.PhaseListener}s.
+ *
* @author Gerhard Petracek
*/
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/AfterFacesRequest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/AfterFacesRequest.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/AfterFacesRequest.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/AfterFacesRequest.java Tue Nov 2 10:52:42 2010
@@ -27,6 +27,11 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Target;
/**
+ * Qualifier for observers which should be invoked before the current {@link javax.faces.context.FacesContext} gets
+ * destroyed.
+ *
+ * Parameter-type of the observer: {@link javax.faces.context.FacesContext}
+ *
* @author Gerhard Petracek
*/
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/BeforeFacesRequest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/BeforeFacesRequest.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/BeforeFacesRequest.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/listener/request/BeforeFacesRequest.java Tue Nov 2 10:52:42 2010
@@ -27,6 +27,10 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Target;
/**
+ * Qualifier for observers which should be invoked as soon as a jsf request is started.
+ *
+ * Parameter-type of the observer: {@link javax.faces.context.FacesContext}
+ *
* @author Gerhard Petracek
*/
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/AbstractRequestTypeResolver.java Tue Nov 2 10:52:42 2010
@@ -23,6 +23,8 @@ import org.apache.myfaces.extensions.cdi
import javax.inject.Inject;
/**
+ * Base implementation which adds the possibility to provide a custom implementation.
+ *
* @author Gerhard Petracek
*/
public abstract class AbstractRequestTypeResolver implements RequestTypeResolver
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/request/RequestTypeResolver.java Tue Nov 2 10:52:42 2010
@@ -19,6 +19,11 @@
package org.apache.myfaces.extensions.cdi.jsf.api.request;
/**
+ * Pluggable (internal) helper for resolving the type of the current request.
+ * For JSF 1.2 it allows to call the functionality
+ * e.g. of a component lib for detecting the type of the current request.
+ * For JSF 2+ it delegates the detection to JSF itself.
+ *
* @author Gerhard Petracek
*/
public interface RequestTypeResolver
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigEntry.java Tue Nov 2 10:52:42 2010
@@ -23,7 +23,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.security.DefaultErrorView;
import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
import static org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils.getOrCreateScopedInstanceOfBeanByName;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageBean;
import javax.inject.Named;
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=1029998&r1=1029997&r2=1029998&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 Tue Nov 2 10:52:42 2010
@@ -26,8 +26,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.impl.utils.ClassDeactivation;
import org.apache.myfaces.extensions.cdi.core.api.Deactivatable;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.JsfViewExtension;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.Extension;
@@ -90,7 +89,7 @@ public class ViewConfigExtension impleme
String defaultPageName = "";
String pageName = defaultPageName;
- String defaultExtension = JsfViewExtension.XHTML;
+ String defaultExtension = Page.Extension.XHTML;
String extension = defaultExtension;
NavigationMode defaultNavigationMode = NavigationMode.DEFAULT;
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=1029998&r1=1029997&r2=1029998&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 Tue Nov 2 10:52:42 2010
@@ -23,7 +23,7 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.core.api.security.AccessDeniedException;
import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
import static org.apache.myfaces.extensions.cdi.core.impl.utils.SecurityUtils.invokeVoters;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PreViewConfigNavigateEvent;
import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCache;
import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigEntry;
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding1.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding1.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding1.java Tue Nov 2 10:52:42 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode;
/**
* @author Gerhard Petracek
@@ -33,7 +33,7 @@ abstract class NavigationOverriding1 imp
{
}
- @Page(navigation = NavigationMode.FORWARD)
+ @Page(navigation = Page.NavigationMode.FORWARD)
public final class ForwardedPage1 extends NavigationOverriding1
{
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding2.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding2.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/NavigationOverriding2.java Tue Nov 2 10:52:42 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.extensions.cd
import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode;
/**
* @author Gerhard Petracek
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java?rev=1029998&r1=1029997&r2=1029998&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/test/java/org/apache/myfaces/extensions/cdi/jsf/test/impl/config/view/ViewConfigTest.java Tue Nov 2 10:52:42 2010
@@ -22,7 +22,8 @@ import org.testng.annotations.Test;
import static org.testng.Assert.*;
import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCache;
import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigEntry;
-import org.apache.myfaces.extensions.cdi.jsf.api.config.view.NavigationMode;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page;
import org.apache.myfaces.extensions.cdi.jsf.test.impl.util.ReflectionUtils;
import static org.apache.myfaces.extensions.cdi.jsf.test.impl.util.ReflectionUtils.*;