You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/09/09 11:21:13 UTC

svn commit: r995359 - in /myfaces/extensions/cdi/trunk: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ examples/jsf-examples/hello_myface...

Author: gpetracek
Date: Thu Sep  9 09:21:11 2010
New Revision: 995359

URL: http://svn.apache.org/viewvc?rev=995359&view=rev
Log:
minor refactoring

Added:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/AnyView.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/AnyView.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ManualView.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/View.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/View.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ViewDefinition.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/AfterFacesRequest.java
      - copied, changed from r993393, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/AfterFacesRequest.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/BeforeFacesRequest.java
      - copied, changed from r993393, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/BeforeFacesRequest.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PageBeanConfigEntry.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PageBeanDefinitionEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntry.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntryHelper.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntryHelper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackPhaseListener.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PreRenderViewBeanLoader.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PreRenderViewBeanLoader.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigCache.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionCache.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigEntry.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigExtension.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionExtension.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.java
      - copied, changed from r993393, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/BeforeAfterFacesRequestBroadcaster.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextFactory.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextWrapper.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/FlowNavigationHandler.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextFactory.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextFactory.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextWrapper.java
      - copied, changed from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java
Removed:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/AnyView.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ManualView.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/View.java
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ViewDefinition.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/AfterFacesRequest.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/BeforeFacesRequest.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/BeforeAfterFacesRequestBroadcaster.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PageBeanDefinitionEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntryHelper.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackPhaseListener.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PreRenderViewBeanLoader.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionCache.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionEntry.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionExtension.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextFactory.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java
Modified:
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/DemoPages.java
    myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/InvalidPage.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/ViewControllerInterceptor.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/DevUtils.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/faces-config.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml

Copied: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/AnyView.java (from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/AnyView.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/AnyView.java?p2=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/AnyView.java&p1=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/AnyView.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/AnyView.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/AnyView.java Thu Sep  9 09:21:11 2010
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.api.view.definition;
+package org.apache.myfaces.extensions.cdi.core.api.config.view;
 
 /**
  * @author Gerhard Petracek
  */
-public final class AnyView implements ViewDefinition
+public final class AnyView implements ViewConfig
 {
 }

Copied: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java (from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ManualView.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java?p2=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java&p1=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ManualView.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ManualView.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ManualView.java Thu Sep  9 09:21:11 2010
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.api.view.definition;
+package org.apache.myfaces.extensions.cdi.core.api.config.view;
 
 /**
  * @author Gerhard Petracek
  */
-public final class ManualView implements ViewDefinition
+public final class ManualView implements ViewConfig
 {
 }

Copied: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/View.java (from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/View.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/View.java?p2=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/View.java&p1=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/View.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/View.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/View.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.api.view.definition;
+package org.apache.myfaces.extensions.cdi.core.api.config.view;
 
 import javax.interceptor.InterceptorBinding;
 import javax.enterprise.util.Nonbinding;
@@ -38,7 +38,7 @@ import java.lang.annotation.Target;
 public @interface View
 {
     @Nonbinding
-    Class<? extends ViewDefinition>[] value();
+    Class<? extends ViewConfig>[] value();
 
     @Nonbinding
     String[] inline() default "";

Copied: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java (from r993397, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ViewDefinition.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java?p2=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java&p1=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ViewDefinition.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/view/definition/ViewDefinition.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewConfig.java Thu Sep  9 09:21:11 2010
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.api.view.definition;
+package org.apache.myfaces.extensions.cdi.core.api.config.view;
 
 /**
  * @author Gerhard Petracek
  */
-public interface ViewDefinition
+public interface ViewConfig
 {
 }

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/listener/phase/FacesDemoBean.java Thu Sep  9 09:21:11 2010
@@ -20,7 +20,7 @@ package org.apache.myfaces.blank.listene
 
 import org.apache.myfaces.blank.view.DemoPages;
 import org.apache.myfaces.blank.view.InvalidPage;
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.View;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.View;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.AfterPhase;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.PhaseId;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.JsfLifecyclePhaseInformation;

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/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/blank/view/DemoPages.java?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/DemoPages.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/DemoPages.java Thu Sep  9 09:21:11 2010
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.blank.view;
 
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.ViewDefinition;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.JsfViewExtension;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.NavigationMode;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.Page;
@@ -30,7 +30,7 @@ import org.apache.myfaces.blank.conversa
  */
 @Page(basePath = "" /*override default to ignore path level*/,
       navigation = NavigationMode.REDIRECT, extension = JsfViewExtension.JSP)
-public abstract class DemoPages implements ViewDefinition
+public abstract class DemoPages implements ViewConfig
 {
     @PageBean(ConversationDemoBean1.class) //triggers e.g. @PostConstruct before the rendering process (if needed)
     @Page(basePath = ".")

Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/InvalidPage.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/InvalidPage.java?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/InvalidPage.java (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/src/main/java/org/apache/myfaces/blank/view/InvalidPage.java Thu Sep  9 09:21:11 2010
@@ -18,13 +18,13 @@
  */
 package org.apache.myfaces.blank.view;
 
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.ViewDefinition;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.Page;
 
 /**
  * @author Gerhard Petracek
  */
 @Page(name = "invalid") //interpreted as /invalid.xhtml
-public class InvalidPage implements ViewDefinition
+public class InvalidPage implements ViewConfig
 {
 }

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/AfterFacesRequest.java (from r993393, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/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/javaee/jsf/api/listener/request/AfterFacesRequest.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/AfterFacesRequest.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/AfterFacesRequest.java&r1=993393&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/AfterFacesRequest.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/AfterFacesRequest.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.api.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.request;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Documented;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/BeforeFacesRequest.java (from r993393, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/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/javaee/jsf/api/listener/request/BeforeFacesRequest.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/BeforeFacesRequest.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/BeforeFacesRequest.java&r1=993393&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/request/BeforeFacesRequest.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/api/listener/request/BeforeFacesRequest.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.api.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.request;
 
 import javax.inject.Qualifier;
 import java.lang.annotation.Documented;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PageBeanConfigEntry.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PageBeanDefinitionEntry.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PageBeanConfigEntry.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PageBeanConfigEntry.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PageBeanDefinitionEntry.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PageBeanDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PageBeanConfigEntry.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.BeforePhase;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.AfterPhase;
@@ -33,7 +33,7 @@ import java.util.List;
 /**
  * @author Gerhard Petracek
  */
-class PageBeanDefinitionEntry
+class PageBeanConfigEntry
 {
     private final String beanName;
 
@@ -41,7 +41,7 @@ class PageBeanDefinitionEntry
 
     private final Map<PhaseId, PhasesLifecycleCallbackEntry> phasesLifecycleCallbacks;
 
-    PageBeanDefinitionEntry(String beanName, Class beanClass)
+    PageBeanConfigEntry(String beanName, Class beanClass)
     {
         this.beanName = beanName;
         this.beanClass = beanClass;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntry.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntry.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntry.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntry.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntry.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntry.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
 import java.lang.reflect.Method;
 import java.util.List;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntryHelper.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntryHelper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntryHelper.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntryHelper.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntryHelper.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackEntryHelper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackEntryHelper.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.PhaseId;
 import static org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.PhaseId.convertToFacesClass;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/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/javaee/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackPhaseListener.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PhasesLifecycleCallbackPhaseListener.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PhasesLifecycleCallbackPhaseListener.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
 import org.apache.myfaces.extensions.cdi.core.impl.utils.CodiUtils;
 import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ExceptionUtils.invalidPhasesCallbackMethod;
@@ -85,20 +85,20 @@ public final class PhasesLifecycleCallba
 
         String viewId = viewRoot.getViewId();
 
-        ViewDefinitionEntry viewDefinitionEntry = ViewDefinitionCache.getViewDefinition(viewId);
+        ViewConfigEntry viewDefinitionEntry = ViewConfigCache.getViewDefinition(viewId);
 
         if(viewDefinitionEntry == null)
         {
             return;
         }
 
-        List<PageBeanDefinitionEntry> beanEntries = viewDefinitionEntry.getBeanDefinitions();
+        List<PageBeanConfigEntry> beanEntries = viewDefinitionEntry.getBeanDefinitions();
 
         Object bean;
         PhasesLifecycleCallbackEntry phasesLifecycleCallbackEntry;
         List<Method> lifecycleCallbacks;
 
-        for(PageBeanDefinitionEntry beanEntry : beanEntries)
+        for(PageBeanConfigEntry beanEntry : beanEntries)
         {
             phasesLifecycleCallbackEntry = beanEntry.getPhasesLifecycleCallback(phaseEvent.getPhaseId());
 

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PreRenderViewBeanLoader.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PreRenderViewBeanLoader.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PreRenderViewBeanLoader.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PreRenderViewBeanLoader.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PreRenderViewBeanLoader.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/PreRenderViewBeanLoader.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/PreRenderViewBeanLoader.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.BeforePhase;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.PhaseId;
@@ -35,16 +35,16 @@ final class PreRenderViewBeanLoader
     {
         String viewId = event.getFacesContext().getViewRoot().getViewId();
 
-        ViewDefinitionEntry viewDefinitionEntry = ViewDefinitionCache.getViewDefinition(viewId);
+        ViewConfigEntry viewDefinitionEntry = ViewConfigCache.getViewDefinition(viewId);
 
         if(viewDefinitionEntry == null)
         {
             return;
         }
 
-        List<PageBeanDefinitionEntry> beanEntries = viewDefinitionEntry.getBeanDefinitions();
+        List<PageBeanConfigEntry> beanEntries = viewDefinitionEntry.getBeanDefinitions();
 
-        for(PageBeanDefinitionEntry beanEntry : beanEntries)
+        for(PageBeanConfigEntry beanEntry : beanEntries)
         {
             //resolve bean to trigger @PostConstruct if it isn't scoped
             CodiUtils.getOrCreateScopedInstanceOfBeanByName(beanEntry.getBeanName(), Object.class);

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigCache.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionCache.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigCache.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigCache.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionCache.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionCache.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigCache.java Thu Sep  9 09:21:11 2010
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.ViewDefinition;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -26,16 +26,16 @@ import java.util.Map;
 /**
  * @author Gerhard Petracek
  */
-public class ViewDefinitionCache
+public class ViewConfigCache
 {
     //we don't need a ConcurrentHashMap - write access is only allowed during the startup (by one thread)
-    private static Map<String, ViewDefinitionEntry> viewIdToViewDefinitionEntryMapping
-            = new HashMap<String, ViewDefinitionEntry>();
+    private static Map<String, ViewConfigEntry> viewIdToViewDefinitionEntryMapping
+            = new HashMap<String, ViewConfigEntry>();
 
-    private static Map<Class<? extends ViewDefinition>, ViewDefinitionEntry> viewDefinitionToViewDefinitionEntryMapping
-            = new HashMap<Class<? extends ViewDefinition>, ViewDefinitionEntry>();
+    private static Map<Class<? extends ViewConfig>, ViewConfigEntry> viewDefinitionToViewDefinitionEntryMapping
+            = new HashMap<Class<? extends ViewConfig>, ViewConfigEntry>();
 
-    static void addViewDefinition(String viewId, ViewDefinitionEntry viewDefinitionEntry)
+    static void addViewDefinition(String viewId, ViewConfigEntry viewDefinitionEntry)
     {
         if(viewIdToViewDefinitionEntryMapping.containsKey(viewId))
         {
@@ -48,12 +48,12 @@ public class ViewDefinitionCache
                 .put(viewDefinitionEntry.getViewDefinitionClass(), viewDefinitionEntry);
     }
 
-    public static ViewDefinitionEntry getViewDefinition(String viewId)
+    public static ViewConfigEntry getViewDefinition(String viewId)
     {
         return viewIdToViewDefinitionEntryMapping.get(viewId);
     }
 
-    public static ViewDefinitionEntry getViewDefinition(Class<? extends ViewDefinition> viewDefinitionClass)
+    public static ViewConfigEntry getViewDefinition(Class<? extends ViewConfig> viewDefinitionClass)
     {
         return viewDefinitionToViewDefinitionEntryMapping.get(viewDefinitionClass);
     }

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigEntry.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionEntry.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigEntry.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigEntry.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionEntry.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionEntry.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigEntry.java Thu Sep  9 09:21:11 2010
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.ViewDefinition;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.NavigationMode;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.PageBean;
 
@@ -31,15 +31,15 @@ import java.beans.Introspector;
 /**
  * @author Gerhard Petracek
  */
-public class ViewDefinitionEntry
+public class ViewConfigEntry
 {
     private final String viewId;
-    private final Class<? extends ViewDefinition> viewDefinitionClass;
+    private final Class<? extends ViewConfig> viewDefinitionClass;
     private final NavigationMode navigationMode;
-    private final List<PageBeanDefinitionEntry> beanDefinition;
+    private final List<PageBeanConfigEntry> beanDefinition;
 
-    public ViewDefinitionEntry(String viewId,
-                               Class<? extends ViewDefinition> viewDefinitionClass,
+    public ViewConfigEntry(String viewId,
+                               Class<? extends ViewConfig> viewDefinitionClass,
                                NavigationMode navigationMode)
     {
         this.viewId = viewId;
@@ -55,7 +55,7 @@ public class ViewDefinitionEntry
         return viewId;
     }
 
-    public Class<? extends ViewDefinition> getViewDefinitionClass()
+    public Class<? extends ViewConfig> getViewDefinitionClass()
     {
         return viewDefinitionClass;
     }
@@ -65,12 +65,12 @@ public class ViewDefinitionEntry
         return navigationMode;
     }
 
-    List<PageBeanDefinitionEntry> getBeanDefinitions()
+    List<PageBeanConfigEntry> getBeanDefinitions()
     {
         return beanDefinition;
     }
 
-    private List<PageBeanDefinitionEntry> findPageBeanDefinitions(Class<? extends ViewDefinition> viewDefinitionClass)
+    private List<PageBeanConfigEntry> findPageBeanDefinitions(Class<? extends ViewConfig> viewDefinitionClass)
     {
         if(!viewDefinitionClass.isAnnotationPresent(PageBean.class) &&
                 !viewDefinitionClass.isAnnotationPresent(PageBean.List.class))
@@ -78,7 +78,7 @@ public class ViewDefinitionEntry
             return Collections.emptyList();
         }
 
-        List<PageBeanDefinitionEntry> result = new ArrayList<PageBeanDefinitionEntry>();
+        List<PageBeanConfigEntry> result = new ArrayList<PageBeanConfigEntry>();
 
         if(viewDefinitionClass.isAnnotationPresent(PageBean.class))
         {
@@ -93,9 +93,9 @@ public class ViewDefinitionEntry
         return result;
     }
 
-    private List<PageBeanDefinitionEntry> extractBeanEntries(PageBean.List pageBeanList)
+    private List<PageBeanConfigEntry> extractBeanEntries(PageBean.List pageBeanList)
     {
-        List<PageBeanDefinitionEntry> result = new ArrayList<PageBeanDefinitionEntry>();
+        List<PageBeanConfigEntry> result = new ArrayList<PageBeanConfigEntry>();
         for(PageBean pageBean : pageBeanList.value())
         {
             result.add(extractBeanEntry(pageBean));
@@ -103,11 +103,11 @@ public class ViewDefinitionEntry
         return result;
     }
 
-    private PageBeanDefinitionEntry extractBeanEntry(PageBean pageBean)
+    private PageBeanConfigEntry extractBeanEntry(PageBean pageBean)
     {
         if(!"".equals(pageBean.name()))
         {
-            return new PageBeanDefinitionEntry(pageBean.name(), pageBean.value());
+            return new PageBeanConfigEntry(pageBean.name(), pageBean.value());
         }
 
         Class<?> pageBeanClass = pageBean.value();
@@ -129,7 +129,7 @@ public class ViewDefinitionEntry
             pageBeanName = Introspector.decapitalize(pageBeanClass.getSimpleName());
         }
 
-        return new PageBeanDefinitionEntry(pageBeanName, pageBeanClass);
+        return new PageBeanConfigEntry(pageBeanName, pageBeanClass);
     }
 
     @Override
@@ -139,12 +139,12 @@ public class ViewDefinitionEntry
         {
             return true;
         }
-        if (!(o instanceof ViewDefinitionEntry))
+        if (!(o instanceof ViewConfigEntry))
         {
             return false;
         }
 
-        ViewDefinitionEntry that = (ViewDefinitionEntry) o;
+        ViewConfigEntry that = (ViewConfigEntry) o;
 
         if (!viewId.equals(that.viewId))
         {

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigExtension.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionExtension.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigExtension.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigExtension.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionExtension.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/ViewDefinitionExtension.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/config/view/ViewConfigExtension.java Thu Sep  9 09:21:11 2010
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view;
 
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.ViewDefinition;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.JsfViewExtension;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.NavigationMode;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.Page;
@@ -34,7 +34,7 @@ import java.util.Map;
  * @author Gerhard Petracek
  */
 @SuppressWarnings({"UnusedDeclaration"})
-public class ViewDefinitionExtension implements Extension
+public class ViewConfigExtension implements Extension
 {
     public void processPageDefinitions(@Observes ProcessAnnotatedType processAnnotatedType)
     {
@@ -47,15 +47,15 @@ public class ViewDefinitionExtension imp
 
     private void addPageDefinition(Class pageDefinitionClass)
     {
-        if(!ViewDefinition.class.isAssignableFrom(pageDefinitionClass))
+        if(!ViewConfig.class.isAssignableFrom(pageDefinitionClass))
         {
             throw new IllegalArgumentException(
                     "the page definition " + pageDefinitionClass.getName() + " has to implement "
-                            + ViewDefinition.class.getName());
+                            + ViewConfig.class.getName());
         }
 
         @SuppressWarnings({"unchecked"})
-        Class<? extends ViewDefinition> viewDefinitionClass = (Class<? extends ViewDefinition>)pageDefinitionClass;
+        Class<? extends ViewConfig> viewDefinitionClass = (Class<? extends ViewConfig>)pageDefinitionClass;
 
         if(Modifier.isAbstract(viewDefinitionClass.getModifiers()))
         {
@@ -162,8 +162,8 @@ public class ViewDefinitionExtension imp
                 result = rootPath + result.substring(1);
             }
         }
-        ViewDefinitionCache.addViewDefinition(
-                result, new ViewDefinitionEntry(result, viewDefinitionClass, navigationMode));
+        ViewConfigCache.addViewDefinition(
+                result, new ViewConfigEntry(result, viewDefinitionClass, navigationMode));
     }
 
     private String convertToPathSyntax(String className, Map<String, String> simpleClassNameToPathMapping)

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/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/javaee/jsf/impl/listener/phase/ViewControllerInterceptor.java?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/ViewControllerInterceptor.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/phase/ViewControllerInterceptor.java Thu Sep  9 09:21:11 2010
@@ -18,12 +18,12 @@
  */
 package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.phase;
 
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.AnyView;
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.View;
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.ViewDefinition;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.AnyView;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.View;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.BeforePhase;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.phase.AfterPhase;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view.ViewDefinitionCache;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view.ViewConfigCache;
 
 import javax.interceptor.Interceptor;
 import javax.interceptor.AroundInvoke;
@@ -120,9 +120,9 @@ public class ViewControllerInterceptor
         return false;
     }
 
-    private boolean isMethodBoundToViewDefinition (Class<? extends ViewDefinition>[] viewDefinitions, String viewId)
+    private boolean isMethodBoundToViewDefinition (Class<? extends ViewConfig>[] viewDefinitions, String viewId)
     {
-        for(Class<? extends ViewDefinition> viewDefinition : viewDefinitions)
+        for(Class<? extends ViewConfig> viewDefinition : viewDefinitions)
         {
             if(resolveViewId(viewDefinition).equals(viewId))
             {
@@ -132,8 +132,8 @@ public class ViewControllerInterceptor
         return false;
     }
 
-    private String resolveViewId(Class<? extends ViewDefinition> viewDefinitionClass)
+    private String resolveViewId(Class<? extends ViewConfig> viewDefinitionClass)
     {
-        return ViewDefinitionCache.getViewDefinition(viewDefinitionClass).getViewId();
+        return ViewConfigCache.getViewDefinition(viewDefinitionClass).getViewId();
     }
 }

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.java (from r993393, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/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/javaee/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/BeforeAfterFacesRequestBroadcaster.java&r1=993393&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/BeforeAfterFacesRequestBroadcaster.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/BeforeAfterFacesRequestBroadcaster.java Thu Sep  9 09:21:11 2010
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.request;
 
-import org.apache.myfaces.extensions.cdi.javaee.jsf.api.request.BeforeFacesRequest;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.api.request.AfterFacesRequest;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.request.BeforeFacesRequest;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.request.AfterFacesRequest;
 
 import javax.enterprise.event.Event;
 import javax.inject.Inject;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextFactory.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/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/javaee/jsf/impl/listener/request/CodiFacesContextFactory.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextFactory.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextFactory.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.request;
 
 import javax.faces.context.FacesContextFactory;
 import javax.faces.context.FacesContext;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextWrapper.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextWrapper.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextWrapper.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/listener/request/CodiFacesContextWrapper.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.request;
 
 import org.apache.myfaces.extensions.cdi.core.api.manager.BeanManagerProvider;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.RedirectedConversationAwareExternalContext;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/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/javaee/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java Thu Sep  9 09:21:11 2010
@@ -16,9 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.navigation;
 
-import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.CodiFacesContextFactory.wrapFacesContext;
+import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.request.CodiFacesContextFactory
+        .wrapFacesContext;
 import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.storeCurrentViewIdAsOldViewId;
 import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.storeCurrentViewIdAsNewViewId;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.JsfUtils;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/FlowNavigationHandler.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/FlowNavigationHandler.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/FlowNavigationHandler.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/navigation/FlowNavigationHandler.java Thu Sep  9 09:21:11 2010
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view.flow;
+package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.navigation;
 
 import org.apache.myfaces.extensions.cdi.core.api.util.ClassUtils;
-import org.apache.myfaces.extensions.cdi.core.api.view.definition.ViewDefinition;
+import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.api.view.definition.NavigationMode;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view.ViewDefinitionCache;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view.ViewDefinitionEntry;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view.ViewConfigCache;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view.ViewConfigEntry;
 
 import javax.faces.FacesException;
 import javax.faces.application.NavigationHandler;
@@ -42,7 +42,7 @@ import java.util.concurrent.CopyOnWriteA
 public class FlowNavigationHandler extends NavigationHandler
 {
     private Set<String> otherOutcomes = new CopyOnWriteArraySet<String>();
-    private Map<String, ViewDefinitionEntry> viewDefinitions = new ConcurrentHashMap<String, ViewDefinitionEntry>();
+    private Map<String, ViewConfigEntry> viewConfigs = new ConcurrentHashMap<String, ViewConfigEntry>();
 
     private NavigationHandler navigationHandler;
 
@@ -64,7 +64,7 @@ public class FlowNavigationHandler exten
                 {
                     outcome = outcome.substring(6);
                 }
-                ViewDefinitionEntry entry = viewDefinitions.get(outcome);
+                ViewConfigEntry entry = viewConfigs.get(outcome);
 
                 if(entry == null)
                 {
@@ -74,17 +74,17 @@ public class FlowNavigationHandler exten
                     {
                         otherOutcomes.add(originalOutcome);
                     }
-                    else if(loadedClass instanceof Class && ViewDefinition.class.isAssignableFrom((Class)loadedClass))
+                    else if(loadedClass instanceof Class && ViewConfig.class.isAssignableFrom((Class)loadedClass))
                     {
                         //noinspection unchecked
-                        entry = ViewDefinitionCache.getViewDefinition((Class<? extends ViewDefinition>)loadedClass);
+                        entry = ViewConfigCache.getViewDefinition((Class<? extends ViewConfig>)loadedClass);
                     }
                 }
 
                 if(entry != null)
                 {
                     processViewDefinitionEntry(facesContext, entry);
-                    viewDefinitions.put(outcome, entry);
+                    viewConfigs.put(outcome, entry);
                     //just to invoke all other nav handlers if they have to perform special tasks...
                     navigationHandler.handleNavigation(facesContext, fromAction, null);
                     return;
@@ -95,7 +95,7 @@ public class FlowNavigationHandler exten
         navigationHandler.handleNavigation(facesContext, fromAction, outcome);
     }
 
-    private void processViewDefinitionEntry(FacesContext facesContext, ViewDefinitionEntry entry)
+    private void processViewDefinitionEntry(FacesContext facesContext, ViewConfigEntry entry)
     {
         String targetViewId = entry.getViewId();
         if(NavigationMode.REDIRECT.equals(entry.getNavigationMode()))

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/DevUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/DevUtils.java?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/DevUtils.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/util/DevUtils.java Thu Sep  9 09:21:11 2010
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util;
 
-import org.apache.myfaces.extensions.cdi.javaee.jsf.api.request.BeforeFacesRequest;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.api.listener.request.BeforeFacesRequest;
 
 import javax.enterprise.event.Observes;
 import javax.faces.context.FacesContext;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/faces-config.xml?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/faces-config.xml Thu Sep  9 09:21:11 2010
@@ -24,15 +24,15 @@
               xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
 
     <application>
-        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.AccessScopeAwareNavigationHandler</navigation-handler>
-        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view.flow.FlowNavigationHandler</navigation-handler>
+        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.navigation.AccessScopeAwareNavigationHandler</navigation-handler>
+        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.navigation.FlowNavigationHandler</navigation-handler>
 
         <view-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.WindowContextAwareViewHandler</view-handler>
     </application>
 
     <factory>
         <lifecycle-factory>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.phase.CodiLifecycleFactoryWrapper</lifecycle-factory>
-        <faces-context-factory>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.CodiFacesContextFactory</faces-context-factory>
+        <faces-context-factory>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.request.CodiFacesContextFactory</faces-context-factory>
         <render-kit-factory>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.CodiRenderKitFactory</render-kit-factory>
     </factory>
 </faces-config>
\ No newline at end of file

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Thu Sep  9 09:21:11 2010
@@ -21,4 +21,4 @@ org.apache.myfaces.extensions.cdi.javaee
 
 org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.GroupedConversationContextExtension
 
-org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view.ViewDefinitionExtension
\ No newline at end of file
+org.apache.myfaces.extensions.cdi.javaee.jsf.impl.config.view.ViewConfigExtension
\ No newline at end of file

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextFactory.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/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/javaee/jsf2/impl/listener/request/CodiFacesContextFactory.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextFactory.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextFactory.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextFactory.java Thu Sep  9 09:21:11 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.listener.request;
 
 import javax.faces.context.FacesContextFactory;
 import javax.faces.context.FacesContext;

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextWrapper.java (from r993397, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextWrapper.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextWrapper.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java&r1=993397&r2=995359&rev=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/listener/request/CodiFacesContextWrapper.java Thu Sep  9 09:21:11 2010
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request;
+package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.listener.request;
 
 import org.apache.myfaces.extensions.cdi.core.api.manager.BeanManagerProvider;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.BeforeAfterFacesRequestBroadcaster;
+import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.request.BeforeAfterFacesRequestBroadcaster;
 import org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation.RedirectedConversationAwareExternalContext;
 
 import javax.enterprise.context.spi.CreationalContext;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java Thu Sep  9 09:21:11 2010
@@ -18,7 +18,8 @@
  */
 package org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation;
 
-import static org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request.CodiFacesContextFactory.wrapFacesContext;
+import static org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.listener.request.CodiFacesContextFactory
+        .wrapFacesContext;
 import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.storeCurrentViewIdAsOldViewId;
 import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.ConversationUtils.storeCurrentViewIdAsNewViewId;
 import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.JsfUtils;

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml?rev=995359&r1=995358&r2=995359&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml Thu Sep  9 09:21:11 2010
@@ -23,7 +23,7 @@
               version="2.0">
 
     <application>
-        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.view.flow.FlowNavigationHandler</navigation-handler>
+        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.navigation.FlowNavigationHandler</navigation-handler>
         <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation.AccessScopeAwareNavigationHandler</navigation-handler>
 
         <view-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.WindowContextAwareViewHandler</view-handler>
@@ -31,7 +31,7 @@
 
     <factory>
         <lifecycle-factory>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.listener.phase.CodiLifecycleFactoryWrapper</lifecycle-factory>
-        <faces-context-factory>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request.CodiFacesContextFactory</faces-context-factory>
+        <faces-context-factory>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.listener.request.CodiFacesContextFactory</faces-context-factory>
         <render-kit-factory>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation.CodiRenderKitFactory</render-kit-factory>
     </factory>
 </faces-config>
\ No newline at end of file