HEADS UP: big facelet checkin

From: Ed Burns <Ed.Burns_at_Sun.COM>
Date: Sat, 08 Nov 2008 05:31:40 -0800

This is already checked in. Since it's mainly an IDE refactoring, I
didn't see the need to have it reviewed. All automated tests run.

This was the EASY part of 274.

This change-bundle is the first of several that will expose select
portions of the Facelets implementation as part of the public JSF API.

In this installment, we're populating the
javax.faces.webapp.pdl.facelets package with the bare minimum of
classes:

A jsf-api/src/javax/faces/webapp/pdl/facelets
A + jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletHandler.java
A + jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletException.java
A + jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletContext.java
A jsf-api/src/javax/faces/webapp/pdl/facelets/package.html

These are straight up IDE refactor->moves with one exception. The
com.sun.faces.facelets.FaceletContext class had several methods relating
to the implementation of templating. I felt these did not need to be in
the public API and thus I created a new abstract base class that extends
FaceletContext and hosts these methods.

A jsf-ri/src/com/sun/faces/facelets/FaceletContextImplBase.java

A subsequent change-bundle will rename this class to
TemplateFaceletContext and make its intent more clear.

All automated tests continue to run.

SECTION: Modified Files
----------------------------
M jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletFactory.java
M jsf-ri/src/com/sun/faces/facelets/impl/DefaultFacelet.java
M jsf-ri/src/com/sun/faces/facelets/impl/PageDeclarationLanguageImpl.java
M jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletContext.java
M jsf-ri/src/com/sun/faces/facelets/Facelet.java
M jsf-ri/src/com/sun/faces/facelets/compiler/CompilationManager.java
M jsf-ri/src/com/sun/faces/facelets/compiler/CompilationUnit.java
M jsf-ri/src/com/sun/faces/facelets/compiler/UILiteralTextHandler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/AbstractUIHandler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/Compiler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/TagUnit.java
M jsf-ri/src/com/sun/faces/facelets/compiler/UIInstructionHandler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/UITextHandler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/TextUnit.java
M jsf-ri/src/com/sun/faces/facelets/compiler/EncodingHandler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/SAXCompiler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceHandler.java
M jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceUnit.java
M jsf-ri/src/com/sun/faces/facelets/compiler/RemoveUnit.java
M jsf-ri/src/com/sun/faces/facelets/TemplateClient.java
M jsf-ri/src/com/sun/faces/facelets/tag/TagAttribute.java
M jsf-ri/src/com/sun/faces/facelets/tag/UserTagHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/TagHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/TagAttributeException.java
M jsf-ri/src/com/sun/faces/facelets/tag/MetaTagHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/DeclareFacetHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/MethodSignatureHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/AttributeHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/InsertFacetHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/AttachedObjectTargetHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredValueHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredMethodHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/TypeHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/ImplementationHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/composite/InterfaceHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/TagException.java
M jsf-ri/src/com/sun/faces/facelets/tag/BeanPropertyTagRule.java
M jsf-ri/src/com/sun/faces/facelets/tag/TagConfig.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentSupport.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValueHolderRule.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/FacetHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/AttributeHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ActionListenerHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValidateDelegateHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/PhaseListenerHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValueChangeListenerHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/LoadBundleHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertNumberHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/VerbatimHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ViewHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDelegateHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDateTimeHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/ConvertHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/CompositeComponentTagHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/ActionSourceRule.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValidateHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentRule.java
M jsf-ri/src/com/sun/faces/facelets/tag/jsf/EditableValueHolderRule.java
M jsf-ri/src/com/sun/faces/facelets/tag/MetadataImpl.java
M jsf-ri/src/com/sun/faces/facelets/tag/MethodRule.java
M jsf-ri/src/com/sun/faces/facelets/tag/MetaRulesetImpl.java
M jsf-ri/src/com/sun/faces/facelets/tag/Metadata.java
M jsf-ri/src/com/sun/faces/facelets/tag/TextHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/CompositeFaceletHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/AbstractTagLibrary.java
M jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/CatchHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseWhenHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ForEachHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseOtherwiseHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/SetHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/IfHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/ui/IncludeHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/ui/CompositionHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/ui/InsertHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/ui/DecorateHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/ui/DefineHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/ui/ParamHandler.java
M jsf-ri/src/com/sun/faces/facelets/tag/ui/RepeatHandler.java
M jsf-ri/src/com/sun/faces/facelets/FaceletFactory.java
M jsf-ri/src/com/sun/faces/application/view/MultiViewHandler.java

A jsf-api/src/javax/faces/webapp/pdl/facelets
A + jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletHandler.java
A + jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletException.java
A + jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletContext.java
A jsf-api/src/javax/faces/webapp/pdl/facelets/package.html
A jsf-ri/src/com/sun/faces/facelets/FaceletContextImplBase.java

D jsf-ri/src/com/sun/faces/facelets/FaceletHandler.java
D jsf-ri/src/com/sun/faces/facelets/FaceletException.java
D jsf-ri/src/com/sun/faces/facelets/FaceletContext.java

SECTION: Diffs
----------------------------
Index: jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletHandler.java
===================================================================
--- jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletHandler.java (revision 0)
+++ jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletHandler.java (working copy)
@@ -49,7 +49,7 @@
 * limitations under the License.
 */

-package com.sun.faces.facelets;
+package javax.faces.webapp.pdl.facelets;

import java.io.IOException;

@@ -58,22 +58,31 @@
import javax.faces.component.UIComponent;

/**
- * A participant in UIComponent tree building
- *
- * @author Jacob Hookom
- * @version $Id$
+ * A participant in UIComponent tree
+ * building.
+ *
+ * @since 2.0
 */
public interface FaceletHandler {

 /**
- * Process changes on a particular UIComponent
+ * Process changes on a particular
+ * UIComponent
 *
 * @param ctx the current FaceletContext instance for this execution
 * @param parent the parent UIComponent to operate upon
- * @throws IOException
- * @throws FacesException
- * @throws FaceletException
- * @throws ELException
+
+ * @throws IOException if unable to load <code>relativePath</code>
+
+ * @throws FaceletException if unable to parse the markup loaded from <code>relativePath</code>
+
+ * @throws FacesException if unable to create child <code>UIComponent</code> instances
+
+ * @throws ELException if any of the expressions in the markup
+ * loaded from <code>relativePath</code> fail
+
+ * @since 2.0
+
 */
 public void apply(FaceletContext ctx, UIComponent parent)
 throws IOException, FacesException, FaceletException, ELException;
Index: jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletException.java
===================================================================
--- jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletException.java (revision 0)
+++ jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletException.java (working copy)
@@ -49,15 +49,15 @@
 * limitations under the License.
 */

-package com.sun.faces.facelets;
+package javax.faces.webapp.pdl.facelets;

import javax.faces.FacesException;

/**
- * An Exception from Facelet implementation
+ * An Exception from Facelet
+ * implementation
 *
- * @author Jacob Hookom
- * @version $Id$
+ * @since 2.0
 */
public class FaceletException extends FacesException {

Index: jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletContext.java
===================================================================
--- jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletContext.java (revision 0)
+++ jsf-api/src/javax/faces/webapp/pdl/facelets/FaceletContext.java (working copy)
@@ -49,7 +49,7 @@
 * limitations under the License.
 */

-package com.sun.faces.facelets;
+package javax.faces.webapp.pdl.facelets;

import java.io.IOException;
import java.net.URL;
@@ -64,10 +64,10 @@
import javax.faces.context.FacesContext;

/**
- * Context representative of a single request from a Facelet
- *
- * @author Jacob Hookom
- * @version $Id$
+ * Context representative of a single
+ * request from a Facelet
+ *
+ * @since 2.0
 */
public abstract class FaceletContext extends ELContext {

@@ -77,114 +77,119 @@
 "com.sun.faces.facelets.FACELET_CONTEXT";

 /**
- * The current FacesContext bound to this "request"
+ * The current FacesContext bound to
+ * this "request". Must not be <code>null</code>.
 *
- * @return cannot be null
+ * @since 2.0
 */
 public abstract FacesContext getFacesContext();

 /**
- * Generate a unique ID for the passed String
+ * Generate a unique ID for the passed
+ * String
 *
- * @param base
- * @return a unique ID given the passed base
+ * @param base the string from which to generate the ID.
+ *
+ * @since 2.0
 */
 public abstract String generateUniqueId(String base);

 /**
- * The ExpressionFactory to use within the Facelet this context is executing
- * upon.
+ * The ExpressionFactory to use within
+ * the Facelet this context is executing upon. Must not be
+ * <code>null</code>.
 *
- * @return cannot be null
+ * @since 2.0
 */
+
 public abstract ExpressionFactory getExpressionFactory();

 /**
- * Set the VariableMapper to use in EL evaluation/creation
+ * Set the VariableMapper to use in EL
+ * evaluation/creation.
 *
- * @param varMapper
+ * @param varMapper the new <code>VariableMapper</code>
+ *
+ * @since 2.0
 */
 public abstract void setVariableMapper(VariableMapper varMapper);

 /**
- * Set the FunctionMapper to use in EL evaluation/creation
+ * Set the FunctionMapper to use in EL
+ * evaluation/creation.
 *
- * @param fnMapper
+ * @param fnMapper the new <code>FunctionMapper</code>
+ *
+ * @since 2.0
 */
 public abstract void setFunctionMapper(FunctionMapper fnMapper);

 /**
- * Support method which is backed by the current VariableMapper
+ * Support method which is backed by
+ * the current VariableMapper.
 *
- * @param name
- * @param value
+ * @param name the name of the attribute
+ * @param value the value of the attribute
+ *
+ * @since 2.0
 */
 public abstract void setAttribute(String name, Object value);

 /**
- * Support method which is backed by the current VariableMapper
+ * Return an attribute set by a
+ * previous call to {_at_link #setAttribute}. Support method which is
+ * backed by the current VariableMapper
 *
- * @param name
- * @return an Object specified for that name
+ * @param name the name of the attribute to return.
+ * @since 2.0
 */
 public abstract Object getAttribute(String name);

 /**
- * Include another Facelet defined at some path, relative to the executing
- * context, not the current Facelet (same as include directive in JSP)
+ * Include another Facelet defined at
+ * some path, relative to the executing context, not the current
+ * Facelet (same as include directive in JSP)
 *
- * @param parent
- * @param relativePath
- * @throws IOException
- * @throws FaceletException
- * @throws FacesException
- * @throws ELException
+ * @param parent the <code>UIComponent</code> that will be the
+ * parent of any components in the included facelet.
+ * @param relativePath the path of the resource containing the
+ * facelet markup, relative to the current markup
+
+ * @throws IOException if unable to load <code>relativePath</code>
+
+ * @throws FaceletException if unable to parse the markup loaded from <code>relativePath</code>
+
+ * @throws FacesException if unable to create child <code>UIComponent</code> instances
+
+ * @throws ELException if any of the expressions in the markup
+ * loaded from <code>relativePath</code> fail
+ *
+ * @since 2.0
 */
 public abstract void includeFacelet(UIComponent parent, String relativePath)
 throws IOException, FaceletException, FacesException, ELException;

 /**
- * Include another Facelet defined at some path, absolute to this
- * ClassLoader/OS
+ * Include another Facelet defined at
+ * some path, absolute to this ClassLoader/OS
 *
- * @param parent
- * @param absolutePath
- * @throws IOException
- * @throws FaceletException
- * @throws FacesException
- * @throws ELException
+ * @param parent the <code>UIComponent</code> that will be the
+ * parent of any components in the included facelet.
+
+ * @param absolutePath the absolute path to the resource containing
+ * the facelet markup
+
+ * @throws IOException if unable to load <code>relativePath</code>
+
+ * @throws FaceletException if unable to parse the markup loaded from <code>relativePath</code>
+
+ * @throws FacesException if unable to create child <code>UIComponent</code> instances
+
+ * @throws ELException if any of the expressions in the markup
+ * loaded from <code>relativePath</code> fail
+
 */
 public abstract void includeFacelet(UIComponent parent, URL absolutePath)
 throws IOException, FaceletException, FacesException, ELException;
-
- /**
- * Push the passed TemplateClient onto the stack for Definition Resolution
- * @param client
- * @see TemplateClient
- */
- public abstract void pushClient(TemplateClient client);
-
- /**
- * Pop the last added TemplateClient
- * @see TemplateClient
- */
- public abstract void popClient(TemplateClient client);
-
-
- public abstract void extendClient(TemplateClient client);
-
- /**
- * This method will walk through the TemplateClient stack to resolve and
- * apply the definition for the passed name.
- * If it's been resolved and applied, this method will return true.
- *
- * @param parent the UIComponent to apply to
- * @param name name or null of the definition you want to apply
- * @return true if successfully applied, otherwise false
- * @throws IOException
- * @throws FaceletException
- * @throws FacesException
- * @throws ELException
- */
- public abstract boolean includeDefinition(UIComponent parent, String name) throws IOException, FaceletException, FacesException, ELException ;
+
}
Index: jsf-api/src/javax/faces/webapp/pdl/facelets/package.html
===================================================================
--- jsf-api/src/javax/faces/webapp/pdl/facelets/package.html (revision 0)
+++ jsf-api/src/javax/faces/webapp/pdl/facelets/package.html (revision 0)
@@ -0,0 +1,16 @@
+<html>
+<head>
+<title>Package Description for "javax.faces.webapp.pdl.facelets"</title>
+</head>
+<body bgcolor="white">
+
+Public classes for the Java code API of
+Facelets. The vast majority of Facelets users have no need to access
+the Java API and can get all their work done using the tag-level
+API.
+
+PENDING: more classes will be added to this package before final
+release of JSF 2.0.
+
+</body>
+</html>
Index: jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletFactory.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletFactory.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletFactory.java (working copy)
@@ -65,9 +65,9 @@
import javax.faces.FacesException;

import com.sun.faces.facelets.Facelet;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.FaceletFactory;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.compiler.Compiler;
import com.sun.faces.util.Util;

Index: jsf-ri/src/com/sun/faces/facelets/impl/DefaultFacelet.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/impl/DefaultFacelet.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/impl/DefaultFacelet.java (working copy)
@@ -74,9 +74,9 @@
import javax.faces.context.FacesContext;

import com.sun.faces.facelets.Facelet;
-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.jsf.ComponentSupport;

/**
Index: jsf-ri/src/com/sun/faces/facelets/impl/PageDeclarationLanguageImpl.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/impl/PageDeclarationLanguageImpl.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/impl/PageDeclarationLanguageImpl.java (working copy)
@@ -51,8 +51,8 @@
package com.sun.faces.facelets.impl;

import com.sun.faces.facelets.Facelet;
-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.FaceletFactory;
import com.sun.faces.facelets.el.VariableMapperWrapper;
import com.sun.faces.facelets.tag.composite.CompositeComponentBeanInfo;
Index: jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletContext.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletContext.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/impl/DefaultFaceletContext.java (working copy)
@@ -51,10 +51,11 @@

package com.sun.faces.facelets.impl;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.TemplateClient;
import com.sun.faces.facelets.Facelet;
+import com.sun.faces.facelets.FaceletContextImplBase;
import com.sun.faces.facelets.el.DefaultVariableMapper;

import javax.el.*;
@@ -77,7 +78,7 @@
 * @version $Id: DefaultFaceletContext.java,v 1.4.4.3 2006/03/25 01:01:53 jhook
 * Exp $
 */
-final class DefaultFaceletContext extends FaceletContext {
+final class DefaultFaceletContext extends FaceletContextImplBase {

 private final FacesContext faces;

Index: jsf-ri/src/com/sun/faces/facelets/FaceletHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/FaceletHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/FaceletHandler.java (working copy)
@@ -1,80 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- * 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 com.sun.faces.facelets;
-
-import java.io.IOException;
-
-import javax.el.ELException;
-import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
-
-/**
- * A participant in UIComponent tree building
- *
- * @author Jacob Hookom
- * @version $Id$
- */
-public interface FaceletHandler {
-
- /**
- * Process changes on a particular UIComponent
- *
- * @param ctx the current FaceletContext instance for this execution
- * @param parent the parent UIComponent to operate upon
- * @throws IOException
- * @throws FacesException
- * @throws FaceletException
- * @throws ELException
- */
- public void apply(FaceletContext ctx, UIComponent parent)
- throws IOException, FacesException, FaceletException, ELException;
-}
Index: jsf-ri/src/com/sun/faces/facelets/FaceletException.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/FaceletException.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/FaceletException.java (working copy)
@@ -1,98 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- * 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 com.sun.faces.facelets;
-
-import javax.faces.FacesException;
-
-/**
- * An Exception from Facelet implementation
- *
- * @author Jacob Hookom
- * @version $Id$
- */
-public class FaceletException extends FacesException {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- /**
- *
- */
- public FaceletException() {
- super();
- }
-
- /**
- * @param message
- */
- public FaceletException(String message) {
- super(message);
- }
-
- /**
- * @param cause
- */
- public FaceletException(Throwable cause) {
- super(cause);
- }
-
- /**
- * @param message
- * @param cause
- */
- public FaceletException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
Index: jsf-ri/src/com/sun/faces/facelets/Facelet.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/Facelet.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/Facelet.java (working copy)
@@ -51,6 +51,7 @@

package com.sun.faces.facelets;

+import javax.faces.webapp.pdl.facelets.FaceletException;
import java.io.IOException;

import javax.el.ELException;
Index: jsf-ri/src/com/sun/faces/facelets/FaceletContextImplBase.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/FaceletContextImplBase.java (revision 0)
+++ jsf-ri/src/com/sun/faces/facelets/FaceletContextImplBase.java (revision 0)
@@ -0,0 +1,84 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package com.sun.faces.facelets;
+
+import java.io.IOException;
+import javax.el.ELException;
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+
+/**
+ *
+ * @author edburns
+ */
+public abstract class FaceletContextImplBase extends FaceletContext {
+
+ /**
+ * Push the passed TemplateClient onto the stack for Definition Resolution
+ * @param client
+ * @see TemplateClient
+ */
+ public abstract void pushClient(TemplateClient client);
+
+ /**
+ * Pop the last added TemplateClient
+ * @see TemplateClient
+ */
+ public abstract void popClient(TemplateClient client);
+
+
+ public abstract void extendClient(TemplateClient client);
+
+ /**
+ * This method will walk through the TemplateClient stack to resolve and
+ * apply the definition for the passed name.
+ * If it's been resolved and applied, this method will return true.
+ *
+ * @param parent the UIComponent to apply to
+ * @param name name or null of the definition you want to apply
+ * @return true if successfully applied, otherwise false
+ * @throws IOException
+ * @throws FaceletException
+ * @throws FacesException
+ * @throws ELException
+ */
+ public abstract boolean includeDefinition(UIComponent parent, String name) throws IOException, FaceletException, FacesException, ELException ;
+
+
+}
Index: jsf-ri/src/com/sun/faces/facelets/FaceletContext.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/FaceletContext.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/FaceletContext.java (working copy)
@@ -1,190 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License"). You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- * language governing permissions and limitations under the License.
- *
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- *
- * Contributor(s):
- *
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license." If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above. However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- *
- * This file incorporates work covered by the following copyright and
- * permission notice:
- *
- * 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 com.sun.faces.facelets;
-
-import java.io.IOException;
-import java.net.URL;
-
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ExpressionFactory;
-import javax.el.FunctionMapper;
-import javax.el.VariableMapper;
-import javax.faces.FacesException;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-/**
- * Context representative of a single request from a Facelet
- *
- * @author Jacob Hookom
- * @version $Id$
- */
-public abstract class FaceletContext extends ELContext {
-
- // The key in the FacesContext attribute map
- // for the FaceletContext instance.
- public static final String FACELET_CONTEXT_KEY =
- "com.sun.faces.facelets.FACELET_CONTEXT";
-
- /**
- * The current FacesContext bound to this "request"
- *
- * @return cannot be null
- */
- public abstract FacesContext getFacesContext();
-
- /**
- * Generate a unique ID for the passed String
- *
- * @param base
- * @return a unique ID given the passed base
- */
- public abstract String generateUniqueId(String base);
-
- /**
- * The ExpressionFactory to use within the Facelet this context is executing
- * upon.
- *
- * @return cannot be null
- */
- public abstract ExpressionFactory getExpressionFactory();
-
- /**
- * Set the VariableMapper to use in EL evaluation/creation
- *
- * @param varMapper
- */
- public abstract void setVariableMapper(VariableMapper varMapper);
-
- /**
- * Set the FunctionMapper to use in EL evaluation/creation
- *
- * @param fnMapper
- */
- public abstract void setFunctionMapper(FunctionMapper fnMapper);
-
- /**
- * Support method which is backed by the current VariableMapper
- *
- * @param name
- * @param value
- */
- public abstract void setAttribute(String name, Object value);
-
- /**
- * Support method which is backed by the current VariableMapper
- *
- * @param name
- * @return an Object specified for that name
- */
- public abstract Object getAttribute(String name);
-
- /**
- * Include another Facelet defined at some path, relative to the executing
- * context, not the current Facelet (same as include directive in JSP)
- *
- * @param parent
- * @param relativePath
- * @throws IOException
- * @throws FaceletException
- * @throws FacesException
- * @throws ELException
- */
- public abstract void includeFacelet(UIComponent parent, String relativePath)
- throws IOException, FaceletException, FacesException, ELException;
-
- /**
- * Include another Facelet defined at some path, absolute to this
- * ClassLoader/OS
- *
- * @param parent
- * @param absolutePath
- * @throws IOException
- * @throws FaceletException
- * @throws FacesException
- * @throws ELException
- */
- public abstract void includeFacelet(UIComponent parent, URL absolutePath)
- throws IOException, FaceletException, FacesException, ELException;
-
- /**
- * Push the passed TemplateClient onto the stack for Definition Resolution
- * @param client
- * @see TemplateClient
- */
- public abstract void pushClient(TemplateClient client);
-
- /**
- * Pop the last added TemplateClient
- * @see TemplateClient
- */
- public abstract void popClient(TemplateClient client);
-
-
- public abstract void extendClient(TemplateClient client);
-
- /**
- * This method will walk through the TemplateClient stack to resolve and
- * apply the definition for the passed name.
- * If it's been resolved and applied, this method will return true.
- *
- * @param parent the UIComponent to apply to
- * @param name name or null of the definition you want to apply
- * @return true if successfully applied, otherwise false
- * @throws IOException
- * @throws FaceletException
- * @throws FacesException
- * @throws ELException
- */
- public abstract boolean includeDefinition(UIComponent parent, String name) throws IOException, FaceletException, FacesException, ELException ;
-}
Index: jsf-ri/src/com/sun/faces/facelets/compiler/CompilationManager.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/CompilationManager.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/CompilationManager.java (working copy)
@@ -57,7 +57,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.Tag;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
Index: jsf-ri/src/com/sun/faces/facelets/compiler/CompilationUnit.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/CompilationUnit.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/CompilationUnit.java (working copy)
@@ -59,9 +59,9 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.CompositeFaceletHandler;

/**
Index: jsf-ri/src/com/sun/faces/facelets/compiler/UILiteralTextHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/UILiteralTextHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/UILiteralTextHandler.java (working copy)
@@ -58,8 +58,8 @@
import javax.el.ELException;
import javax.faces.FacesException;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.jsf.ComponentSupport;

final class UILiteralTextHandler extends AbstractUIHandler {
Index: jsf-ri/src/com/sun/faces/facelets/compiler/AbstractUIHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/AbstractUIHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/AbstractUIHandler.java (working copy)
@@ -53,8 +53,8 @@

import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.TextHandler;
import com.sun.faces.facelets.tag.jsf.core.FacetHandler;

Index: jsf-ri/src/com/sun/faces/facelets/compiler/Compiler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/Compiler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/Compiler.java (working copy)
@@ -64,8 +64,8 @@
import javax.faces.FacesException;
import javax.faces.context.FacesContext;

-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.CompositeTagDecorator;
import com.sun.faces.facelets.tag.CompositeTagLibrary;
import com.sun.faces.facelets.tag.TagDecorator;
Index: jsf-ri/src/com/sun/faces/facelets/compiler/TagUnit.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/TagUnit.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/TagUnit.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.compiler;

-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.Tag;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagLibrary;
Index: jsf-ri/src/com/sun/faces/facelets/compiler/UIInstructionHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/UIInstructionHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/UIInstructionHandler.java (working copy)
@@ -58,8 +58,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.el.ELText;
import com.sun.faces.facelets.tag.jsf.ComponentSupport;
import com.sun.faces.facelets.util.FastWriter;
Index: jsf-ri/src/com/sun/faces/facelets/compiler/UITextHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/UITextHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/UITextHandler.java (working copy)
@@ -58,8 +58,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.el.ELText;
import com.sun.faces.facelets.tag.jsf.ComponentSupport;
import com.sun.faces.facelets.util.FastWriter;
Index: jsf-ri/src/com/sun/faces/facelets/compiler/TextUnit.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/TextUnit.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/TextUnit.java (working copy)
@@ -57,7 +57,7 @@

import javax.el.ELException;

-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.el.ELText;
import com.sun.faces.facelets.tag.CompositeFaceletHandler;
import com.sun.faces.facelets.tag.Tag;
Index: jsf-ri/src/com/sun/faces/facelets/compiler/EncodingHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/EncodingHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/EncodingHandler.java (working copy)
@@ -57,9 +57,9 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;

public class EncodingHandler implements FaceletHandler {

Index: jsf-ri/src/com/sun/faces/facelets/compiler/SAXCompiler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/SAXCompiler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/SAXCompiler.java (working copy)
@@ -73,8 +73,8 @@
import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.DefaultHandler;

-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.Location;
import com.sun.faces.facelets.tag.Tag;
import com.sun.faces.facelets.tag.TagAttribute;
Index: jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceHandler.java (working copy)
@@ -60,9 +60,9 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.el.CompositeFunctionMapper;
import com.sun.faces.facelets.tag.TagLibrary;

Index: jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceUnit.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceUnit.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/NamespaceUnit.java (working copy)
@@ -54,7 +54,7 @@
import java.util.HashMap;
import java.util.Map;

-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.TagLibrary;

/**
Index: jsf-ri/src/com/sun/faces/facelets/compiler/RemoveUnit.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/compiler/RemoveUnit.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/compiler/RemoveUnit.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.compiler;

-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;

/**
 *
Index: jsf-ri/src/com/sun/faces/facelets/TemplateClient.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/TemplateClient.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/TemplateClient.java (working copy)
@@ -51,6 +51,8 @@

package com.sun.faces.facelets;

+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import java.io.IOException;

import javax.el.ELException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/TagAttribute.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/TagAttribute.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/TagAttribute.java (working copy)
@@ -56,7 +56,7 @@
import javax.el.MethodExpression;
import javax.el.ValueExpression;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.el.ELText;
import com.sun.faces.facelets.el.TagMethodExpression;
import com.sun.faces.facelets.el.TagValueExpression;
Index: jsf-ri/src/com/sun/faces/facelets/tag/UserTagHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/UserTagHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/UserTagHandler.java (working copy)
@@ -51,6 +51,7 @@

package com.sun.faces.facelets.tag;

+import com.sun.faces.facelets.FaceletContextImplBase;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
@@ -63,8 +64,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.TemplateClient;
import com.sun.faces.facelets.el.VariableMapperWrapper;
import com.sun.faces.facelets.tag.ui.DefineHandler;
@@ -114,8 +115,9 @@
 * @see VariableMapper
 * @see com.sun.faces.facelets.FaceletHandler#apply(com.sun.faces.facelets.FaceletContext, javax.faces.component.UIComponent)
 */
- public void apply(FaceletContext ctx, UIComponent parent)
+ public void apply(FaceletContext ctxObj, UIComponent parent)
 throws IOException, FacesException, FaceletException, ELException {
+ FaceletContextImplBase ctx = (FaceletContextImplBase) ctxObj;
 VariableMapper orig = ctx.getVariableMapper();

 // setup a variable map
Index: jsf-ri/src/com/sun/faces/facelets/tag/TagHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/TagHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/TagHandler.java (working copy)
@@ -55,7 +55,7 @@
import java.util.Iterator;
import java.util.List;

-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;

/**
 * Foundation class for FaceletHandlers associated with markup in a Facelet
Index: jsf-ri/src/com/sun/faces/facelets/tag/TagAttributeException.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/TagAttributeException.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/TagAttributeException.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.tag;

-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletException;

/**
 * An Exception caused by a TagAttribute
Index: jsf-ri/src/com/sun/faces/facelets/tag/MetaTagHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/MetaTagHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/MetaTagHandler.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.tag;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.util.Util;

/**
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/DeclareFacetHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/DeclareFacetHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/DeclareFacetHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/MethodSignatureHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/MethodSignatureHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/MethodSignatureHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
import java.io.IOException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/AttributeHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/AttributeHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/AttributeHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/InsertFacetHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/InsertFacetHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/InsertFacetHandler.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.jsf.ComponentConfig;
import com.sun.faces.facelets.tag.jsf.ComponentHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/AttachedObjectTargetHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/AttachedObjectTargetHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/AttachedObjectTargetHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredValueHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredValueHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredValueHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
import java.io.IOException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredMethodHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredMethodHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/DeferredMethodHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
import java.io.IOException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/TypeHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/TypeHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/TypeHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
import java.io.IOException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/ImplementationHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/ImplementationHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/ImplementationHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
import java.io.IOException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/composite/InterfaceHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/composite/InterfaceHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/composite/InterfaceHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.composite;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/TagException.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/TagException.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/TagException.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.tag;

-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletException;

/**
 * An Exception caused by a Tag
Index: jsf-ri/src/com/sun/faces/facelets/tag/BeanPropertyTagRule.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/BeanPropertyTagRule.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/BeanPropertyTagRule.java (working copy)
@@ -54,7 +54,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;

/**
 *
Index: jsf-ri/src/com/sun/faces/facelets/tag/TagConfig.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/TagConfig.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/TagConfig.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.tag;

-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;

/**
 * Passed to the constructor of TagHandler, it defines the document definition
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentSupport.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentSupport.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentSupport.java (working copy)
@@ -62,7 +62,7 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;

Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentHandler.java (working copy)
@@ -66,7 +66,7 @@
import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.tag.MetaTagHandler;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValueHolderRule.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValueHolderRule.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValueHolderRule.java (working copy)
@@ -55,7 +55,7 @@
import javax.faces.component.ValueHolder;
import javax.faces.convert.Converter;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.el.LegacyValueBinding;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.Metadata;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/FacetHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/FacetHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/FacetHandler.java (working copy)
@@ -57,8 +57,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/AttributeHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/AttributeHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/AttributeHandler.java (working copy)
@@ -57,8 +57,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ActionListenerHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ActionListenerHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ActionListenerHandler.java (working copy)
@@ -64,8 +64,8 @@
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/SetPropertyActionListenerHandler.java (working copy)
@@ -68,8 +68,8 @@
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.el.LegacyValueBinding;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValidateDelegateHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValidateDelegateHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValidateDelegateHandler.java (working copy)
@@ -53,7 +53,7 @@

import javax.faces.validator.Validator;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.MetaRuleset;
import com.sun.faces.facelets.tag.jsf.ValidateHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/PhaseListenerHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/PhaseListenerHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/PhaseListenerHandler.java (working copy)
@@ -65,8 +65,8 @@
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValueChangeListenerHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValueChangeListenerHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ValueChangeListenerHandler.java (working copy)
@@ -64,8 +64,8 @@
import javax.faces.event.ValueChangeEvent;
import javax.faces.event.ValueChangeListener;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/LoadBundleHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/LoadBundleHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/LoadBundleHandler.java (working copy)
@@ -67,8 +67,8 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertNumberHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertNumberHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertNumberHandler.java (working copy)
@@ -56,8 +56,8 @@
import javax.faces.convert.Converter;
import javax.faces.convert.NumberConverter;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.MetaRuleset;
import com.sun.faces.facelets.tag.jsf.ComponentSupport;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/VerbatimHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/VerbatimHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/VerbatimHandler.java (working copy)
@@ -55,7 +55,7 @@

import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.tag.TextHandler;
import com.sun.faces.facelets.tag.jsf.ComponentConfig;
import com.sun.faces.facelets.tag.jsf.ComponentHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ViewHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ViewHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ViewHandler.java (working copy)
@@ -60,8 +60,8 @@
import javax.faces.component.UIViewRoot;
import javax.faces.event.PhaseEvent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDelegateHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDelegateHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDelegateHandler.java (working copy)
@@ -55,8 +55,8 @@
import javax.faces.FacesException;
import javax.faces.convert.Converter;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.MetaRuleset;
import com.sun.faces.facelets.tag.jsf.ConvertHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDateTimeHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDateTimeHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/core/ConvertDateTimeHandler.java (working copy)
@@ -58,8 +58,8 @@
import javax.faces.convert.Converter;
import javax.faces.convert.DateTimeConverter;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.MetaRuleset;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/ConvertHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/ConvertHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/ConvertHandler.java (working copy)
@@ -61,8 +61,8 @@
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.MetaTagHandler;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/CompositeComponentTagHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/CompositeComponentTagHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/CompositeComponentTagHandler.java (working copy)
@@ -72,8 +72,8 @@
import javax.faces.webapp.pdl.AttachedObjectHandler;

import com.sun.faces.facelets.Facelet;
-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.FaceletFactory;
import com.sun.faces.facelets.el.VariableMapperWrapper;
import com.sun.faces.facelets.tag.TagAttribute;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/ActionSourceRule.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/ActionSourceRule.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/ActionSourceRule.java (working copy)
@@ -56,7 +56,7 @@
import javax.faces.event.ActionEvent;
import javax.faces.event.MethodExpressionActionListener;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.el.LegacyMethodBinding;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.Metadata;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValidateHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValidateHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/ValidateHandler.java (working copy)
@@ -60,8 +60,8 @@
import javax.faces.component.UIComponent;
import javax.faces.validator.Validator;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.MetaTagHandler;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentRule.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentRule.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/ComponentRule.java (working copy)
@@ -56,7 +56,7 @@

import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.el.LegacyValueBinding;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.Metadata;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jsf/EditableValueHolderRule.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jsf/EditableValueHolderRule.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jsf/EditableValueHolderRule.java (working copy)
@@ -58,7 +58,7 @@
import javax.faces.event.ValueChangeEvent;
import javax.faces.validator.MethodExpressionValidator;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.el.LegacyMethodBinding;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.Metadata;
Index: jsf-ri/src/com/sun/faces/facelets/tag/MetadataImpl.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/MetadataImpl.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/MetadataImpl.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.tag;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;

/**
 *
Index: jsf-ri/src/com/sun/faces/facelets/tag/MethodRule.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/MethodRule.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/MethodRule.java (working copy)
@@ -56,7 +56,7 @@
import javax.el.MethodExpression;
import javax.faces.el.MethodBinding;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.el.LegacyMethodBinding;

/**
Index: jsf-ri/src/com/sun/faces/facelets/tag/MetaRulesetImpl.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/MetaRulesetImpl.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/MetaRulesetImpl.java (working copy)
@@ -61,7 +61,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.util.Util;

/**
Index: jsf-ri/src/com/sun/faces/facelets/tag/Metadata.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/Metadata.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/Metadata.java (working copy)
@@ -51,7 +51,7 @@

package com.sun.faces.facelets.tag;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;

/**
 * External information on how to wire dynamic or literal state to the
Index: jsf-ri/src/com/sun/faces/facelets/tag/TextHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/TextHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/TextHandler.java (working copy)
@@ -50,7 +50,7 @@
 */
package com.sun.faces.facelets.tag;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;

/**
 * A mixin' interface that allows other code to identify FaceletHandlers
Index: jsf-ri/src/com/sun/faces/facelets/tag/CompositeFaceletHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/CompositeFaceletHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/CompositeFaceletHandler.java (working copy)
@@ -57,9 +57,9 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;

/**
 * A FaceletHandler that is derived of 1 or more, inner FaceletHandlers. This
Index: jsf-ri/src/com/sun/faces/facelets/tag/AbstractTagLibrary.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/AbstractTagLibrary.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/AbstractTagLibrary.java (working copy)
@@ -61,8 +61,8 @@
import javax.el.ELException;
import javax.faces.FacesException;

-import com.sun.faces.facelets.FaceletException;
-import com.sun.faces.facelets.FaceletHandler;
+import javax.faces.webapp.pdl.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletHandler;
import com.sun.faces.facelets.tag.jsf.ComponentConfig;
import com.sun.faces.facelets.tag.jsf.ComponentHandler;
import com.sun.faces.facelets.tag.jsf.ConvertHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/CatchHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/CatchHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/CatchHandler.java (working copy)
@@ -57,8 +57,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseWhenHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseWhenHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseWhenHandler.java (working copy)
@@ -60,8 +60,8 @@
import javax.el.ELException;
import javax.faces.FacesException;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagHandler;

/**
Index: jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ForEachHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ForEachHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ForEachHandler.java (working copy)
@@ -51,8 +51,8 @@

package com.sun.faces.facelets.tag.jstl.core;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseOtherwiseHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseOtherwiseHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseOtherwiseHandler.java (working copy)
@@ -59,8 +59,8 @@
import javax.el.ELException;
import javax.faces.FacesException;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagHandler;

/**
Index: jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/SetHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/SetHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/SetHandler.java (working copy)
@@ -58,8 +58,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/IfHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/IfHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/IfHandler.java (working copy)
@@ -57,7 +57,7 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/jstl/core/ChooseHandler.java (working copy)
@@ -64,8 +64,8 @@

import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagHandler;

/**
Index: jsf-ri/src/com/sun/faces/facelets/tag/ui/IncludeHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/ui/IncludeHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/ui/IncludeHandler.java (working copy)
@@ -58,8 +58,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.el.VariableMapperWrapper;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/ui/CompositionHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/ui/CompositionHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/ui/CompositionHandler.java (working copy)
@@ -51,6 +51,7 @@

package com.sun.faces.facelets.tag.ui;

+import com.sun.faces.facelets.FaceletContextImplBase;
import java.io.IOException;
import java.io.FileNotFoundException;
import java.util.ArrayList;
@@ -66,8 +67,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.TemplateClient;
import com.sun.faces.facelets.el.VariableMapperWrapper;
import com.sun.faces.facelets.tag.TagAttribute;
@@ -133,8 +134,10 @@
 * @see com.sun.facelets.FaceletHandler#apply(com.sun.facelets.FaceletContext,
 * javax.faces.component.UIComponent)
 */
- public void apply(FaceletContext ctx, UIComponent parent)
+ public void apply(FaceletContext ctxObj, UIComponent parent)
 throws IOException, FacesException, FaceletException, ELException {
+ FaceletContextImplBase ctx = (FaceletContextImplBase) ctxObj;
+
 if (this.template != null) {
 VariableMapper orig = ctx.getVariableMapper();
 if (this.params != null) {
Index: jsf-ri/src/com/sun/faces/facelets/tag/ui/InsertHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/ui/InsertHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/ui/InsertHandler.java (working copy)
@@ -51,14 +51,15 @@

package com.sun.faces.facelets.tag.ui;

+import com.sun.faces.facelets.FaceletContextImplBase;
import java.io.IOException;

import javax.el.ELException;
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.TemplateClient;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
@@ -95,8 +96,9 @@
 * @see com.sun.facelets.FaceletHandler#apply(com.sun.facelets.FaceletContext,
 * javax.faces.component.UIComponent)
 */
- public void apply(FaceletContext ctx, UIComponent parent)
+ public void apply(FaceletContext ctxObj, UIComponent parent)
 throws IOException, FacesException, FaceletException, ELException {
+ FaceletContextImplBase ctx = (FaceletContextImplBase) ctxObj;

 ctx.extendClient(this);
 boolean found = false;
Index: jsf-ri/src/com/sun/faces/facelets/tag/ui/DecorateHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/ui/DecorateHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/ui/DecorateHandler.java (working copy)
@@ -51,6 +51,7 @@

package com.sun.faces.facelets.tag.ui;

+import com.sun.faces.facelets.FaceletContextImplBase;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -65,8 +66,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.TemplateClient;
import com.sun.faces.facelets.el.VariableMapperWrapper;
import com.sun.faces.facelets.tag.TagAttribute;
@@ -125,8 +126,9 @@
 * @see com.sun.facelets.FaceletHandler#apply(com.sun.facelets.FaceletContext,
 * javax.faces.component.UIComponent)
 */
- public void apply(FaceletContext ctx, UIComponent parent)
+ public void apply(FaceletContext ctxObj, UIComponent parent)
 throws IOException, FacesException, FaceletException, ELException {
+ FaceletContextImplBase ctx = (FaceletContextImplBase) ctxObj;
 VariableMapper orig = ctx.getVariableMapper();
 if (this.params != null) {
 VariableMapper vm = new VariableMapperWrapper(orig);
Index: jsf-ri/src/com/sun/faces/facelets/tag/ui/DefineHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/ui/DefineHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/ui/DefineHandler.java (working copy)
@@ -57,8 +57,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagAttributeException;
import com.sun.faces.facelets.tag.TagConfig;
Index: jsf-ri/src/com/sun/faces/facelets/tag/ui/ParamHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/ui/ParamHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/ui/ParamHandler.java (working copy)
@@ -58,8 +58,8 @@
import javax.faces.FacesException;
import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
-import com.sun.faces.facelets.FaceletException;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletException;
import com.sun.faces.facelets.tag.TagAttribute;
import com.sun.faces.facelets.tag.TagConfig;
import com.sun.faces.facelets.tag.TagHandler;
Index: jsf-ri/src/com/sun/faces/facelets/tag/ui/RepeatHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/tag/ui/RepeatHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/tag/ui/RepeatHandler.java (working copy)
@@ -59,7 +59,7 @@

import javax.faces.component.UIComponent;

-import com.sun.faces.facelets.FaceletContext;
+import javax.faces.webapp.pdl.facelets.FaceletContext;
import com.sun.faces.facelets.tag.MetaRuleset;
import com.sun.faces.facelets.tag.Metadata;
import com.sun.faces.facelets.tag.TagAttribute;
Index: jsf-ri/src/com/sun/faces/facelets/FaceletFactory.java
===================================================================
--- jsf-ri/src/com/sun/faces/facelets/FaceletFactory.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/facelets/FaceletFactory.java (working copy)
@@ -51,6 +51,7 @@

package com.sun.faces.facelets;

+import javax.faces.webapp.pdl.facelets.FaceletException;
import java.io.IOException;

import java.net.URL;
Index: jsf-ri/src/com/sun/faces/application/view/MultiViewHandler.java
===================================================================
--- jsf-ri/src/com/sun/faces/application/view/MultiViewHandler.java (revision 5725)
+++ jsf-ri/src/com/sun/faces/application/view/MultiViewHandler.java (working copy)
@@ -51,10 +51,12 @@
import javax.faces.context.FacesContext;
import javax.faces.render.RenderKitFactory;
import javax.faces.render.ResponseStateManager;
+import javax.faces.webapp.pdl.PageDeclarationLanguage;
import javax.servlet.http.HttpServletResponse;

import com.sun.faces.RIConstants;
import com.sun.faces.config.WebConfiguration;
+import com.sun.faces.facelets.impl.PageDeclarationLanguageImpl;
import com.sun.faces.util.FacesLogger;
import com.sun.faces.util.MessageUtils;
import com.sun.faces.util.Util;
@@ -95,6 +97,7 @@
 * The {_at_link ViewHandlingStrategy} instances used by this {_at_link ViewHandler}.
 */
 protected ViewHandlingStrategyManager viewHandlingStrategy;
+ private PageDeclarationLanguage pdl;

 private String[] configuredExtensions;

@@ -561,8 +564,27 @@
 }

 }
+
+ /*
+ * PENDING(edburns): This is temporary for Public Review Draft.
+ * Really, I think the way to go is to change PageDeclarationLanguage to
+ * to take on all of the mantle of ViewHandlingStrategy, do away with
+ * ViewHandlingStrategy, provide a factory for PageDeclarationLanguage
+ * and specify that the runtime must have a PDL impl for both JSP
+ * and Facelets.
+ */

+ @Override
+ public PageDeclarationLanguage getPageDeclarationLanguage() {
+ if (null == pdl) {
+ pdl = new PageDeclarationLanguageImpl();
+ }
+ return pdl;
+ }
+
+

+
 // ---------------------------------------------------------- Public Methods

SECTION: New Files
----------------------------
SEE ATTACHMENTS

-- 
| ed.burns_at_sun.com  | office: 408 884 9519 OR x31640
| homepage:         | http://ridingthecrest.com/