myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gpetra...@apache.org
Subject svn commit: r1169580 - in /myfaces/extensions/cdi/trunk: core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/ jee-modules/jsf-modu...
Date Sun, 11 Sep 2011 23:24:51 GMT
Author: gpetracek
Date: Sun Sep 11 23:24:49 2011
New Revision: 1169580

URL: http://svn.apache.org/viewvc?rev=1169580&view=rev
Log:
EXTCDI-171 renamed to page-parameter

Added:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageParameter.java
      - copied, changed from r1169568, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewParameter.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageParameterStrategy.java
      - copied, changed from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigParameterStrategy.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterContext.java
      - copied, changed from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigParameterContext.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterInterceptor.java
      - copied, changed from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterInterceptor.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterListInterceptor.java
      - copied, changed from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterListInterceptor.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageParameterStrategy.java
      - copied, changed from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigParameterStrategy.java
Modified:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewParameter.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigParameterStrategy.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigParameterContext.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterInterceptor.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterListInterceptor.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigParameterStrategy.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageParameter.java
(from r1169568, myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewParameter.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/PageParameter.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageParameter.java&p1=myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewParameter.java&r1=1169568&r2=1169580&rev=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/config/view/ViewParameter.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jsf/api/config/view/PageParameter.java
Sun Sep 11 23:24:49 2011
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.myfaces.extensions.cdi.core.api.config.view;
+package org.apache.myfaces.extensions.cdi.jsf.api.config.view;
 
 import javax.enterprise.util.Nonbinding;
 import javax.interceptor.InterceptorBinding;
@@ -40,7 +40,7 @@ import static java.lang.annotation.Reten
 @Documented
 
 @InterceptorBinding
-public @interface ViewParameter
+public @interface PageParameter
 {
     /**
      * Key of the parameter
@@ -71,6 +71,6 @@ public @interface ViewParameter
          * @return parameters
          */
         @Nonbinding
-        ViewParameter[] value();
+        PageParameter[] value();
     }
 }

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageParameterStrategy.java
(from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigParameterStrategy.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/DefaultPageParameterStrategy.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageParameterStrategy.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigParameterStrategy.java&r1=1169568&r2=1169580&rev=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultViewConfigParameterStrategy.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/DefaultPageParameterStrategy.java
Sun Sep 11 23:24:49 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.impl.config.view;
 
-import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.spi.ViewConfigParameterStrategy;
+import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.spi.PageParameterStrategy;
 
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
@@ -28,19 +28,19 @@ import javax.interceptor.InvocationConte
  * @author Gerhard Petracek
  */
 @Dependent
-public class DefaultViewConfigParameterStrategy implements ViewConfigParameterStrategy
+public class DefaultPageParameterStrategy implements PageParameterStrategy
 {
     private static final long serialVersionUID = 898321901578229292L;
 
     @Inject
-    private ViewConfigParameterContext viewConfigParameterContext;
+    private PageParameterContext pageParameterContext;
 
     /**
      * {@inheritDoc}
      */
     public void addParameter(String key, String value)
     {
-        this.viewConfigParameterContext.addViewParameter(key, value);
+        this.pageParameterContext.addPageParameter(key, value);
     }
 
     /**

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterContext.java
(from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigParameterContext.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/PageParameterContext.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterContext.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigParameterContext.java&r1=1169568&r2=1169580&rev=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewConfigParameterContext.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterContext.java
Sun Sep 11 23:24:49 2011
@@ -30,20 +30,20 @@ import java.util.Map;
  */
 //currently internal - in case of community feedback we could introduce a spi for it
 @RequestScoped
-public class ViewConfigParameterContext
+public class PageParameterContext
 {
     private Map<String, String> parameters = new HashMap<String, String>();
 
-    protected ViewConfigParameterContext()
+    protected PageParameterContext()
     {
     }
 
-    public Map<String, String> getViewParameters()
+    public Map<String, String> getPageParameters()
     {
         return Collections.unmodifiableMap(this.parameters);
     }
 
-    public void addViewParameter(String key, String value)
+    public void addPageParameter(String key, String value)
     {
         if(value == null)
         {

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterInterceptor.java
(from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterInterceptor.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/PageParameterInterceptor.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterInterceptor.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterInterceptor.java&r1=1169568&r2=1169580&rev=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterInterceptor.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterInterceptor.java
Sun Sep 11 23:24:49 2011
@@ -18,8 +18,8 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.impl.config.view;
 
-import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewParameter;
-import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.spi.ViewConfigParameterStrategy;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageParameter;
+import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.spi.PageParameterStrategy;
 
 import javax.inject.Inject;
 import javax.interceptor.AroundInvoke;
@@ -31,24 +31,24 @@ import java.io.Serializable;
  * @author Gerhard Petracek
  */
 
-@ViewParameter(key = "", value = "")
+@PageParameter(key = "", value = "")
 @Interceptor
-public class ViewParameterInterceptor implements Serializable
+public class PageParameterInterceptor implements Serializable
 {
     private static final long serialVersionUID = 8762625956958428994L;
 
     @Inject
-    protected ViewConfigParameterStrategy viewConfigParameterStrategy;
+    protected PageParameterStrategy pageParameterStrategy;
 
     @AroundInvoke
     public Object addParameter(InvocationContext invocationContext) throws Exception
     {
-        addViewParameter(invocationContext.getMethod().getAnnotation(ViewParameter.class));
-        return this.viewConfigParameterStrategy.execute(invocationContext);
+        addPageParameter(invocationContext.getMethod().getAnnotation(PageParameter.class));
+        return this.pageParameterStrategy.execute(invocationContext);
     }
 
-    protected void addViewParameter(ViewParameter viewParameter)
+    protected void addPageParameter(PageParameter pageParameter)
     {
-        this.viewConfigParameterStrategy.addParameter(viewParameter.key(), viewParameter.value());
+        this.pageParameterStrategy.addParameter(pageParameter.key(), pageParameter.value());
     }
 }

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterListInterceptor.java
(from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterListInterceptor.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/PageParameterListInterceptor.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterListInterceptor.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterListInterceptor.java&r1=1169568&r2=1169580&rev=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/ViewParameterListInterceptor.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/PageParameterListInterceptor.java
Sun Sep 11 23:24:49 2011
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.cdi.jsf.impl.config.view;
 
-import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewParameter;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageParameter;
 
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
@@ -27,9 +27,9 @@ import javax.interceptor.InvocationConte
 /**
  * @author Gerhard Petracek
  */
-@ViewParameter.List({})
+@PageParameter.List({})
 @Interceptor
-public class ViewParameterListInterceptor extends ViewParameterInterceptor
+public class PageParameterListInterceptor extends PageParameterInterceptor
 {
     private static final long serialVersionUID = 7673273779460871224L;
 
@@ -40,11 +40,11 @@ public class ViewParameterListIntercepto
     @AroundInvoke
     public Object addParameter(InvocationContext invocationContext) throws Exception
     {
-        for(ViewParameter requestParameter : invocationContext.getMethod()
-                .getAnnotation(ViewParameter.List.class).value())
+        for(PageParameter pageParameter : invocationContext.getMethod()
+                .getAnnotation(PageParameter.List.class).value())
         {
-            addViewParameter(requestParameter);
+            addPageParameter(pageParameter);
         }
-        return this.viewConfigParameterStrategy.execute(invocationContext);
+        return this.pageParameterStrategy.execute(invocationContext);
     }
 }

Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageParameterStrategy.java
(from r1169568, myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigParameterStrategy.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageParameterStrategy.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageParameterStrategy.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigParameterStrategy.java&r1=1169568&r2=1169580&rev=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/ViewConfigParameterStrategy.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/view/spi/PageParameterStrategy.java
Sun Sep 11 23:24:49 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.extensions.cdi
 /**
  * @author Gerhard Petracek
  */
-public interface ViewConfigParameterStrategy extends InterceptorStrategy
+public interface PageParameterStrategy extends InterceptorStrategy
 {
     /**
      * Allows to add the parameter to an (internal) context

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=1169580&r1=1169579&r2=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/ViewConfigAwareNavigationHandler.java
Sun Sep 11 23:24:49 2011
@@ -22,7 +22,7 @@ import static org.apache.myfaces.extensi
 
 import org.apache.myfaces.extensions.cdi.core.api.config.view.DefaultErrorView;
 import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewConfig;
-import org.apache.myfaces.extensions.cdi.core.api.config.view.ViewParameter;
+import org.apache.myfaces.extensions.cdi.jsf.api.config.view.PageParameter;
 import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
 import org.apache.myfaces.extensions.cdi.jsf.api.config.view.Page.NavigationMode;
@@ -31,7 +31,7 @@ import org.apache.myfaces.extensions.cdi
 import org.apache.myfaces.extensions.cdi.jsf.api.config.view.ViewConfigDescriptor;
 import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigCache;
 
-import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigParameterContext;
+import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.PageParameterContext;
 import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.spi.EditableViewConfigDescriptor;
 import org.apache.myfaces.extensions.cdi.jsf.impl.util.JsfUtils;
 
@@ -61,7 +61,7 @@ public class ViewConfigAwareNavigationHa
 
     private BeanManager beanManager;
 
-    private ViewConfigParameterContext viewConfigParameterContext;
+    private PageParameterContext pageParameterContext;
 
     /**
      * Constructor which allows to use the given {@link NavigationHandler}
@@ -161,32 +161,32 @@ public class ViewConfigAwareNavigationHa
 
     private void addConfiguredViewParameters(Class<?> viewConfigClass)
     {
-        if(this.viewConfigParameterContext != null)
+        if(this.pageParameterContext != null)
         {
-            ViewParameter viewParameter = viewConfigClass.getAnnotation(ViewParameter.class);
+            PageParameter pageParameter = viewConfigClass.getAnnotation(PageParameter.class);
 
-            if(viewParameter != null)
+            if(pageParameter != null)
             {
-                addConfiguredViewParameter(viewParameter);
+                addConfiguredPageParameter(pageParameter);
             }
             else
             {
-                ViewParameter.List viewParameterList = viewConfigClass.getAnnotation(ViewParameter.List.class);
+                PageParameter.List pageParameterList = viewConfigClass.getAnnotation(PageParameter.List.class);
 
-                if(viewParameterList != null)
+                if(pageParameterList != null)
                 {
-                    for(ViewParameter currentViewParameter : viewParameterList.value())
+                    for(PageParameter currentPageParameter : pageParameterList.value())
                     {
-                        addConfiguredViewParameter(currentViewParameter);
+                        addConfiguredPageParameter(currentPageParameter);
                     }
                 }
             }
         }
     }
 
-    private void addConfiguredViewParameter(ViewParameter viewParameter)
+    private void addConfiguredPageParameter(PageParameter viewParameter)
     {
-        this.viewConfigParameterContext.addViewParameter(viewParameter.key(), viewParameter.value());
+        this.pageParameterContext.addPageParameter(viewParameter.key(), viewParameter.value());
     }
 
     private String convertEntryToOutcome(ExternalContext externalContext, ViewConfigDescriptor
entry)
@@ -266,8 +266,8 @@ public class ViewConfigAwareNavigationHa
         if(this.beanManager == null)
         {
             this.beanManager = BeanManagerProvider.getInstance().getBeanManager();
-            this.viewConfigParameterContext =
-                    CodiUtils.getContextualReferenceByClass(this.beanManager, ViewConfigParameterContext.class,
true);
+            this.pageParameterContext =
+                    CodiUtils.getContextualReferenceByClass(this.beanManager, PageParameterContext.class,
true);
         }
     }
 

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java?rev=1169580&r1=1169579&r2=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/util/JsfUtils.java
Sun Sep 11 23:24:49 2011
@@ -37,7 +37,7 @@ import java.util.Set;
 
 import org.apache.myfaces.extensions.cdi.core.impl.scope.conversation.spi.WindowContextManager;
 import org.apache.myfaces.extensions.cdi.core.impl.util.CodiUtils;
-import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewConfigParameterContext;
+import org.apache.myfaces.extensions.cdi.jsf.impl.config.view.PageParameterContext;
 
 /**
  * keep in sync with extval!
@@ -144,18 +144,18 @@ public abstract class JsfUtils
      * @param externalContext current external-context
      * @param url current url
      * @param addRequestParameter flag which indicates if the request params should be added
or not
-     * @param addCodiViewParameter flag which indicates if the view params should be added
or not {@see ViewParameter}
+     * @param addPageParameter flag which indicates if the view params should be added or
not {@see ViewParameter}
      * @return url with request-parameters
      */
     public static String addParameters(ExternalContext externalContext, String url,
-                                       boolean addRequestParameter, boolean addCodiViewParameter)
+                                       boolean addRequestParameter, boolean addPageParameter)
     {
         StringBuilder finalUrl = new StringBuilder(url);
         boolean existingParameters = url.contains("?");
         boolean urlContainsWindowId = url.contains(WindowContextManager.WINDOW_CONTEXT_ID_PARAMETER_KEY
+ "=");
 
         for(RequestParameter requestParam :
-                getParameters(externalContext, true, addRequestParameter, addCodiViewParameter))
+                getParameters(externalContext, true, addRequestParameter, addPageParameter))
         {
             String key = requestParam.getKey();
 
@@ -192,13 +192,13 @@ public abstract class JsfUtils
      * @param externalContext current external-context
      * @param filterViewState flag which indicates if the view-state should be added or not
      * @param addRequestParameter flag which indicates if the request params should be added
or not
-     * @param addCodiViewParameter flag which indicates if the view params should be added
or not {@see ViewParameter}
+     * @param addPageParameter flag which indicates if the view params should be added or
not {@see ViewParameter}
      * @return current request-parameters
      */
     public static Set<RequestParameter> getParameters(ExternalContext externalContext,
                                                       boolean filterViewState,
                                                       boolean addRequestParameter,
-                                                      boolean addCodiViewParameter)
+                                                      boolean addPageParameter)
     {
         Set<RequestParameter> result = new HashSet<RequestParameter>();
 
@@ -222,16 +222,16 @@ public abstract class JsfUtils
             }
         }
 
-        if(addCodiViewParameter)
+        if(addPageParameter)
         {
-            ViewConfigParameterContext viewConfigParameterContext =
-                    CodiUtils.getContextualReferenceByClass(ViewConfigParameterContext.class,
true);
+            PageParameterContext pageParameterContext =
+                    CodiUtils.getContextualReferenceByClass(PageParameterContext.class, true);
 
-            if(viewConfigParameterContext != null)
+            if(pageParameterContext != null)
             {
-                for(Map.Entry<String, String> entry : viewConfigParameterContext.getViewParameters().entrySet())
+                for(Map.Entry<String, String> entry : pageParameterContext.getPageParameters().entrySet())
                 {
-                    //TODO add multi-value support - see comment in ViewConfigParameterContext
+                    //TODO add multi-value support - see comment in PageParameterContext
                     result.add(new RequestParameter(entry.getKey(), new String[] {entry.getValue()}));
                 }
             }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml?rev=1169580&r1=1169579&r2=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml
Sun Sep 11 23:24:49 2011
@@ -25,7 +25,7 @@
         <class>org.apache.myfaces.extensions.cdi.jsf.impl.security.SecurityInterceptor</class>
         <class>org.apache.myfaces.extensions.cdi.jsf.impl.listener.phase.ViewControllerInterceptor</class>
         <class>org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.CloseConversationGroupInterceptor</class>
-        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewParameterInterceptor</class>
-        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewParameterListInterceptor</class>
+        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.PageParameterInterceptor</class>
+        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.PageParameterListInterceptor</class>
     </interceptors>
 </beans>

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml?rev=1169580&r1=1169579&r2=1169580&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml
(original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/beans.xml
Sun Sep 11 23:24:49 2011
@@ -25,7 +25,7 @@
         <class>org.apache.myfaces.extensions.cdi.jsf.impl.security.SecurityInterceptor</class>
         <class>org.apache.myfaces.extensions.cdi.jsf.impl.listener.phase.ViewControllerInterceptor</class>
         <class>org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.CloseConversationGroupInterceptor</class>
-        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewParameterInterceptor</class>
-        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.ViewParameterListInterceptor</class>
+        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.PageParameterInterceptor</class>
+        <class>org.apache.myfaces.extensions.cdi.jsf.impl.config.view.PageParameterListInterceptor</class>
     </interceptors>
 </beans>



Mime
View raw message