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/28 22:26:20 UTC
svn commit: r1002345 - in /myfaces/extensions/cdi/trunk/jee-modules:
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/
jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/
Author: gpetracek
Date: Tue Sep 28 20:26:19 2010
New Revision: 1002345
URL: http://svn.apache.org/viewvc?rev=1002345&view=rev
Log:
EXTCDI-57 and EXTCDI-63
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java?rev=1002345&r1=1002344&r2=1002345&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/navigation/AccessScopeAwareNavigationHandler.java Tue Sep 28 20:26:19 2010
@@ -18,8 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.navigation;
-import static org.apache.myfaces.extensions.cdi.jsf.impl.listener.request.CodiFacesContextFactory
- .wrapFacesContext;
+import org.apache.myfaces.extensions.cdi.jsf.impl.listener.request.CodiFacesContextFactory;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils.storeCurrentViewIdAsOldViewId;
import static org.apache.myfaces.extensions.cdi.jsf.impl.util.ConversationUtils.storeCurrentViewIdAsNewViewId;
import org.apache.myfaces.extensions.cdi.jsf.impl.util.JsfUtils;
@@ -53,4 +52,9 @@ public class AccessScopeAwareNavigationH
storeCurrentViewIdAsNewViewId(facesContext);
}
+
+ protected FacesContext wrapFacesContext(FacesContext facesContext)
+ {
+ return CodiFacesContextFactory.wrapFacesContext(facesContext);
+ }
}
Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/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/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java?rev=1002345&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/AccessScopeAwareNavigationHandler.java Tue Sep 28 20:26:19 2010
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.cdi.jsf2.impl.navigation;
+
+import org.apache.myfaces.extensions.cdi.jsf2.impl.listener.request.CodiFacesContextFactory;
+
+import javax.faces.application.NavigationHandler;
+import javax.faces.context.FacesContext;
+
+/**
+ * @author Gerhard Petracek
+ */
+public class AccessScopeAwareNavigationHandler extends
+ org.apache.myfaces.extensions.cdi.jsf.impl.navigation.AccessScopeAwareNavigationHandler
+{
+ public AccessScopeAwareNavigationHandler(NavigationHandler navigationHandler)
+ {
+ super(navigationHandler);
+ }
+
+ @Override
+ protected FacesContext wrapFacesContext(FacesContext facesContext)
+ {
+ return CodiFacesContextFactory.wrapFacesContext(facesContext);
+ }
+}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java?rev=1002345&r1=1002344&r2=1002345&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java Tue Sep 28 20:26:19 2010
@@ -52,8 +52,7 @@ public class CodiNavigationHandler exten
ViewConfigAwareNavigationHandler viewConfigAwareNavigationHandler =
new ViewConfigAwareNavigationHandler(this.navigationHandler);
- return new org.apache.myfaces.extensions.cdi.jsf.impl.navigation
- .AccessScopeAwareNavigationHandler(viewConfigAwareNavigationHandler);
+ return new AccessScopeAwareNavigationHandler(viewConfigAwareNavigationHandler);
}
public NavigationCase getNavigationCase(FacesContext context, String action, String outcome)