/*
 * JBoss, Home of Professional Open Source
 * Copyright 2011, Red Hat, Inc., and individual contributors
 * by the @authors tag. See the copyright.txt in the distribution for a
 * full listing of individual contributors.
 *
 * Licensed 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.jboss.seam.faces.environment;

import javax.enterprise.context.RequestScoped;
import javax.enterprise.inject.Produces;
import javax.faces.application.Application;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
import javax.inject.Inject;

/**
 * <p>
 * A producer which retrieves the current JSF NavigationHandler by calling {@link Application#getNavigationHandler()}, thus
 * allowing it to be injected.
 * </p>
 *
 * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
 */
public class NavigationHandlerProducer {
    @Inject
    FacesContext context;

    @Produces
    @RequestScoped
    public NavigationHandler getNavigationHandler() {
        if (context != null) {
            Application application = context.getApplication();
            if (application != null) {
                return application.getNavigationHandler();
            }
        }
        return null;
    }
}

@@ -1086,16 +1086,44 @@
 Inject;%0D
+%0Aimport javax.inject.Named;%0D
 %0A%0D%0A/**%0D%0A
@@ -1377,16 +1377,83 @@
 II%3C/a%3E%0D%0A
+ * @author %3Ca href=%22mailto:bleathem@gmail.com%22%3EBrian Leathem%3C/a%3E %0D%0A
  */%0D%0Apub
@@ -1568,16 +1568,28 @@
 Scoped%0D%0A
+    @Named%0D%0A
     publ

Make the NavigationHandler accessible via EL