Bug 315587 - patch 3/3
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/apiPackages.txt b/plugins/org.eclipse.jst.jsf.doc.dev/apiPackages.txt
index 99fa885..fc76029 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/apiPackages.txt
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/apiPackages.txt
@@ -18,6 +18,10 @@
 org.eclipse.jst.jsf.facesconfig.emf.impl,
 org.eclipse.jst.jsf.facesconfig.emf.util,
 org.eclipse.jst.jsf.common.dom,
+org.eclipse.jst.jsf.common.internal.componentcore,
+org.eclipse.jst.jsf.common.internal.finder.acceptor,
+org.eclipse.jst.jsf.common.internal.finder.matcher,
+org.eclipse.jst.jsf.common.internal.util,
 org.eclipse.jst.jsf.common.metadata,
 org.eclipse.jst.jsf.common.metadata.query,
 org.eclipse.jst.jsf.common.metadata.traittypes.traittypes,
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
index 333d5e6..8170493 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
@@ -34,6 +34,7 @@
 	org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries,\
 	org.eclipse.jst.jsf.core.propertyresolver,\
 	org.eclipse.jst.jsf.core.variableresolver,\
+	org.eclipse.jst.jsf.core.jsfFacetConfiguration,\
+	org.eclipse.jst.jsf.core.symbolContextResolverFactory,\
 	org.eclipse.jst.pagedesigner.pageDesignerExtension,\
-	org.eclipse.jst.pagedesigner.popupMenuContributor,\
-	org.eclipse.jst.pagedesigner.propertyContributor
\ No newline at end of file
+	org.eclipse.jst.pagedesigner.popupMenuContributor
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html
index 89eaa2b..b871e18 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html
@@ -40,6 +40,9 @@
 <a href="jsf/org_eclipse_jst_jsf_core_externalcontext.html">org.eclipse.jst.jsf.core.externalcontext</a>
 </li>
 <li>
+<a href="jsf/org_eclipse_jst_jsf_core_jsfFacetConfiguration.html">org.eclipse.jst.jsf.core.jsfFacetConfiguration</a>
+</li>
+<li>
 <a href="jsf/org_eclipse_jst_jsf_core_jsfLibraries.html">org.eclipse.jst.jsf.core.jsfLibraries</a>
 </li>
 <li>
@@ -55,6 +58,9 @@
 <a href="jsf/org_eclipse_jst_jsf_core_propertyresolver.html">org.eclipse.jst.jsf.core.propertyresolver</a>
 </li>
 <li>
+<a href="jsf/org_eclipse_jst_jsf_core_symbolContextResolverFactory.html">org.eclipse.jst.jsf.core.symbolContextResolverFactory</a>
+</li>
+<li>
 <a href="jsf/org_eclipse_jst_jsf_core_variableresolver.html">org.eclipse.jst.jsf.core.variableresolver</a>
 </li>
 <li>
@@ -63,9 +69,6 @@
 <li>
 <a href="jsf/org_eclipse_jst_pagedesigner_popupMenuContributor.html">org.eclipse.jst.pagedesigner.popupMenuContributor</a>
 </li>
-<li>
-<a href="jsf/org_eclipse_jst_pagedesigner_propertyContributor.html">org.eclipse.jst.pagedesigner.propertyContributor</a>
-</li>
 </ul>
 </body>
 </html>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainQueryFactory.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainQueryFactory.html
new file mode 100644
index 0000000..8dd3480
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainQueryFactory.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Metadata Domain Query Factory (internal)</title>
+<style type="text/css">@import url("../../book.css");</style>
+<style type="text/css">@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1 style="text-align:center">Metadata Domain Query Factory (internal)</H1>
+<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.jst.jsf.common.domainQueryFactory<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>Helios
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>internal... not provisional API<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
+<p></p>
+<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.factory">factory</a>?)&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
+<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+</ul>
+<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.factory">factory</a> EMPTY&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST factory</p>
+<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+<li><b>class</b> - </li>
+</ul>
+<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>[Enter extension point usage example here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>[Enter API information here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
+<p></p>
+
+<br>
+<p class="note SchemaCopyright">
+Copyright 2010 Oracle
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_mdModelManagerFactory.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_mdModelManagerFactory.html
new file mode 100644
index 0000000..04f1e75
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_mdModelManagerFactory.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Metadata Model Manager Factory (internal)</title>
+<style type="text/css">@import url("../../book.css");</style>
+<style type="text/css">@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1 style="text-align:center">Metadata Model Manager Factory (internal)</H1>
+<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.jst.jsf.common.mdModelManagerFactory<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>Helios
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>internal... not API<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
+<p></p>
+<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.factory">factory</a>?)&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
+<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+</ul>
+<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.factory">factory</a> EMPTY&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST factory</p>
+<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+<li><b>class</b> - </li>
+</ul>
+<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>[Enter extension point usage example here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>[Enter API information here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
+<p></p>
+
+<br>
+<p class="note SchemaCopyright">
+Copyright 2010 Oracle
+All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
index 30cd093..a3879b4 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
@@ -37,6 +37,9 @@
 <br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>see org.eclipse.jst.jsf.taglibprocessing plugin for examples of usage
 <p></p>
 
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>cm-attribute annotation elements can have an "attribute-value-runtime-type" property that maps to the id of this ext-pt.  The property must be fully qualified with the extender's plugin id.   i.e.  if type is FooType, the property value must be com.foo.bar.FooType.
+<p></p>
+
 <br>
 <p class="note SchemaCopyright">
 Copyright (c) 2006 Oracle Corporation.
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfAppConfigLocatorProviderFactory.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfAppConfigLocatorProviderFactory.html
new file mode 100644
index 0000000..2310716
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfAppConfigLocatorProviderFactory.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>jsfAppConfigLocatorProviderFactory</title>
+<style type="text/css">@import url("../../book.css");</style>
+<style type="text/css">@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1 style="text-align:center">jsfAppConfigLocatorProviderFactory</H1>
+<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.jst.jsf.core.jsfAppConfigLocatorProviderFactory<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>[Enter the first release in which this extension point appears.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>internal... not provisional API<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
+<p></p>
+<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.locatorProvider">locatorProvider</a>*)&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
+<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+</ul>
+<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.locatorProvider">locatorProvider</a> EMPTY&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST locatorProvider</p>
+<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+<li><b>class</b> - </li>
+</ul>
+<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>[Enter extension point usage example here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>[Enter API information here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
+<p></p>
+
+<br>
+<p class="note SchemaCopyright">
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfAppConfigManagerFactory.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfAppConfigManagerFactory.html
new file mode 100644
index 0000000..504d50a
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfAppConfigManagerFactory.html
@@ -0,0 +1,44 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>JSF App Config Manager Factory</title>
+<style type="text/css">@import url("../../book.css");</style>
+<style type="text/css">@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1 style="text-align:center">JSF App Config Manager Factory</H1>
+<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.jst.jsf.core.jsfAppConfigManagerFactory<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>[Enter the first release in which this extension point appears.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>internal... not provisional API<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
+<p></p>
+<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.factory">factory</a>)&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
+<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+</ul>
+<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.factory">factory</a> EMPTY&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST factory</p>
+<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+<li><b>class</b> - </li>
+</ul>
+<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>[Enter extension point usage example here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>[Enter API information here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
+<p></p>
+
+<br>
+<p class="note SchemaCopyright">
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html
index 7662737..6bf8fee 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html
@@ -50,6 +50,9 @@
 </p>
 <p></p>
 
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>Value of the attribute class must be a fully qualified name of a Java class that extends the abstract class <code>org.eclipse.jst.jsf.core.jsflibraryregistry.JSFLibraryArchiveFilesDelegate</code> and has a public 0-arg constructor.
+<p></p>
+
 <h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>none
 <p></p>
 
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html
index 9803e82..36ab039 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html
@@ -56,6 +56,11 @@
 </p>
 <p></p>
 
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>This extension point is deprecated.
+
+Value of the attribute class must be a fully qualified name of a Java class that extends the abstract class <code>org.eclipse.jst.jsf.core.jsflibraryregistry.PluginProvidedJSFLibraryJarFilesDelegate</code> and has a public 0-arg constructor.
+<p></p>
+
 <h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>none
 <p></p>
 
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_symbolContextResolverFactory.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_symbolContextResolverFactory.html
index 24938bb..ab59fbc 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_symbolContextResolverFactory.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_symbolContextResolverFactory.html
@@ -12,7 +12,7 @@
 <h6 class="CaptionFigColumn SchemaHeader">Since: </h6>[Enter the first release in which this extension point appears.]
 <p></p>
 
-<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>[Enter description of this extension point.]<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>Provisional API -- subject to change.<p></p>
 <h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
 <p></p>
 <p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.symbolFactoryDelegate">symbolFactoryDelegate</a>)&gt;</p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_tagRegistryFactory.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_tagRegistryFactory.html
new file mode 100644
index 0000000..1ddc7ef
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_tagRegistryFactory.html
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>Tag Registry Factory Provider</title>
+<style type="text/css">@import url("../../book.css");</style>
+<style type="text/css">@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1 style="text-align:center">Tag Registry Factory Provider</H1>
+<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.jst.jsf.core.tagRegistryFactoryProvider<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Since: </h6>[Enter the first release in which this extension point appears.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Description: </h6>Internal use only. Do not use.<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
+<p></p>
+<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> EMPTY&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST extension</p>
+<p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+</ul>
+<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.factoryProvider">factoryProvider</a> EMPTY&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST factoryProvider</p>
+<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED</p>&gt;</p>
+<p></p>
+<p class="ConfigMarkupElementDesc">
+Define the factory used to create all available tag registries.</p>
+<br>
+<ul class="ConfigMarkupAttlistDesc">
+<li><b>class</b> - A provider used to override the default creation of tag registries by the CompositeTagRegistry.</li>
+</ul>
+<br><h6 class="CaptionFigColumn SchemaHeader">Examples: </h6>[Enter extension point usage example here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">API Information: </h6>[Enter API information here.]
+<p></p>
+
+<h6 class="CaptionFigColumn SchemaHeader">Supplied Implementation: </h6>[Enter information about supplied implementation of this extension point.]
+<p></p>
+
+<br>
+<p class="note SchemaCopyright">
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html
index a8d2709..2963386 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html
@@ -15,7 +15,7 @@
 <h6 class="CaptionFigColumn SchemaHeader">Description: </h6><p><b>This extension point is provisional and subject to change</b></p><p></p>
 <h6 class="CaptionFigColumn SchemaHeader">Configuration Markup:</h6>
 <p></p>
-<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.localDropHandler">localDropHandler</a>* , <a href="#e.attributeCellEditorFactory">attributeCellEditorFactory</a>* , <a href="#e.tagConverterFactory">tagConverterFactory</a>* , <a href="#e.elementEditFactory">elementEditFactory</a>* , <a href="#e.linkCreator">linkCreator</a>* , <a href="#e.tagAttributeCellEditorFactory">tagAttributeCellEditorFactory</a>* , <a href="#e.tagTransformOperation">tagTransformOperation</a>* , <a href="#e.dtResourceProvider">dtResourceProvider</a>* , <a href="#e.propertyPageFactory">propertyPageFactory</a>* , <a href="#e.paletteFactory">paletteFactory</a>*)&gt;</p>
+<p class="code SchemaDtd">&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.localDropHandler">localDropHandler</a>* , <a href="#e.attributeCellEditorFactory">attributeCellEditorFactory</a>* , <a href="#e.tagConverterFactory">tagConverterFactory</a>* , <a href="#e.elementEditFactory">elementEditFactory</a>* , <a href="#e.linkCreator">linkCreator</a>* , <a href="#e.tagAttributeCellEditorFactory">tagAttributeCellEditorFactory</a>* , <a href="#e.tagTransformOperation">tagTransformOperation</a>* , <a href="#e.dtResourceProvider">dtResourceProvider</a>* , <a href="#e.propertyPageFactory">propertyPageFactory</a>* , <a href="#e.paletteFactory">paletteFactory</a>* , <a href="#e.attributeValueResolver">attributeValueResolver</a>*)&gt;</p>
 <p class="code SchemaDtd">&lt;!ATTLIST extension</p>
 <p class="code SchemaDtdAttlist">point&nbsp;CDATA #REQUIRED</p><p class="code SchemaDtdAttlist">id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</p><p class="code SchemaDtdAttlist">name&nbsp;&nbsp;CDATA #IMPLIED</p>&gt;</p>
 <p></p>
@@ -111,6 +111,13 @@
 <ul class="ConfigMarkupAttlistDesc">
 <li><b>class</b> - Provisional API.  If an extension point is found in the system, the Web Page Editor will use the factory implementation to provide its paletteViewerPage</li>
 </ul>
+<br><p class="code SchemaDtd">&lt;!ELEMENT <a name="e.attributeValueResolver">attributeValueResolver</a> EMPTY&gt;</p>
+<p class="code SchemaDtd">&lt;!ATTLIST attributeValueResolver</p>
+<p class="code SchemaDtdAttlist">class&nbsp;CDATA #REQUIRED</p>&gt;</p>
+<p></p>
+<ul class="ConfigMarkupAttlistDesc">
+<li><b>class</b> - </li>
+</ul>
 <br><br>
 <p class="note SchemaCopyright">
 Copyright 2006 Sybase and others
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadoctoc.xml b/plugins/org.eclipse.jst.jsf.doc.dev/javadoctoc.xml
index abe28f0..41e6b88 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/javadoctoc.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadoctoc.xml
@@ -2,6 +2,10 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 	 <toc label="Javadoc Packages Reference">
 <topic href="html/api_reference/org/eclipse/jst/jsf/common/dom/package-summary.html" label="org.eclipse.jst.jsf.common.dom"/>
+<topic href="html/api_reference/org/eclipse/jst/jsf/common/internal/componentcore/package-summary.html" label="org.eclipse.jst.jsf.common.internal.componentcore"/>
+<topic href="html/api_reference/org/eclipse/jst/jsf/common/internal/finder/acceptor/package-summary.html" label="org.eclipse.jst.jsf.common.internal.finder.acceptor"/>
+<topic href="html/api_reference/org/eclipse/jst/jsf/common/internal/finder/matcher/package-summary.html" label="org.eclipse.jst.jsf.common.internal.finder.matcher"/>
+<topic href="html/api_reference/org/eclipse/jst/jsf/common/internal/util/package-summary.html" label="org.eclipse.jst.jsf.common.internal.util"/>
 <topic href="html/api_reference/org/eclipse/jst/jsf/common/metadata/package-summary.html" label="org.eclipse.jst.jsf.common.metadata"/>
 <topic href="html/api_reference/org/eclipse/jst/jsf/common/metadata/query/package-summary.html" label="org.eclipse.jst.jsf.common.metadata.query"/>
 <topic href="html/api_reference/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/package-summary.html" label="org.eclipse.jst.jsf.common.metadata.traittypes.traittypes"/>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml b/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
index ba469ea..87f9e73 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
@@ -1 +1 @@
-<files component="jsf"><file>org_eclipse_jst_jsf_common_contextSymbolFactory.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainLoadingStrategies.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainSourceModelTypes.html</file>/n/n<file>org_eclipse_jst_jsf_common_standardMetaDataFiles.html</file>/n/n<file>org_eclipse_jst_jsf_common_symbolSourceProvider.html</file>/n/n<file>org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html</file>/n/n<file>org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html</file>/n/n<file>org_eclipse_jst_jsf_core_customViewMapper.html</file>/n/n<file>org_eclipse_jst_jsf_core_externalcontext.html</file>/n/n<file>org_eclipse_jst_jsf_core_jsfFacetConfiguration.html</file>/n/n<file>org_eclipse_jst_jsf_core_jsfLibraries.html</file>/n/n<file>org_eclipse_jst_jsf_core_methodresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html</file>/n/n<file>org_eclipse_jst_jsf_core_propertyresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_symbolContextResolverFactory.html</file>/n/n<file>org_eclipse_jst_jsf_core_tagregistry.html</file>/n/n<file>org_eclipse_jst_jsf_core_variableresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_viewhandler.html</file>/n/n<file>org_eclipse_jst_pagedesigner_pageDesignerExtension.html</file>/n/n<file>org_eclipse_jst_pagedesigner_popupMenuContributor.html</file>/n/n<file>org_eclipse_jst_pagedesigner_propertyContributor.html</file></files>
\ No newline at end of file
+<files component="jsf"><file>org_eclipse_jst_jsf_common_contextSymbolFactory.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainLoadingStrategies.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainQueryFactory.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainSourceModelTypes.html</file>/n/n<file>org_eclipse_jst_jsf_common_mdModelManagerFactory.html</file>/n/n<file>org_eclipse_jst_jsf_common_standardMetaDataFiles.html</file>/n/n<file>org_eclipse_jst_jsf_common_symbolSourceProvider.html</file>/n/n<file>org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html</file>/n/n<file>org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html</file>/n/n<file>org_eclipse_jst_jsf_core_customViewMapper.html</file>/n/n<file>org_eclipse_jst_jsf_core_externalcontext.html</file>/n/n<file>org_eclipse_jst_jsf_core_jsfAppConfigLocatorProviderFactory.html</file>/n/n<file>org_eclipse_jst_jsf_core_jsfAppConfigManagerFactory.html</file>/n/n<file>org_eclipse_jst_jsf_core_jsfFacetConfiguration.html</file>/n/n<file>org_eclipse_jst_jsf_core_jsfLibraries.html</file>/n/n<file>org_eclipse_jst_jsf_core_methodresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html</file>/n/n<file>org_eclipse_jst_jsf_core_propertyresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_symbolContextResolverFactory.html</file>/n/n<file>org_eclipse_jst_jsf_core_tagRegistryFactory.html</file>/n/n<file>org_eclipse_jst_jsf_core_tagregistry.html</file>/n/n<file>org_eclipse_jst_jsf_core_variableresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_viewhandler.html</file>/n/n<file>org_eclipse_jst_pagedesigner_pageDesignerExtension.html</file>/n/n<file>org_eclipse_jst_pagedesigner_popupMenuContributor.html</file>/n/n<file>org_eclipse_jst_pagedesigner_propertyContributor.html</file></files>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml b/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml
index b39f7b2..d0625b9 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml
@@ -1 +1 @@
-<packages><package></package><package>org.eclipse.jst.jsf.common.dom</package><package>org.eclipse.jst.jsf.common.metadata</package><package>org.eclipse.jst.jsf.common.metadata.query</package><package>org.eclipse.jst.jsf.common.metadata.traittypes.traittypes</package><package>org.eclipse.jst.jsf.common.sets</package><package>org.eclipse.jst.jsf.common.sets.constraint</package><package>org.eclipse.jst.jsf.common.sets.mapping</package><package>org.eclipse.jst.jsf.common.util</package><package>org.eclipse.jst.jsf.context</package><package>org.eclipse.jst.jsf.context.resolver</package><package>org.eclipse.jst.jsf.context.resolver.structureddocument</package><package>org.eclipse.jst.jsf.context.structureddocument</package><package>org.eclipse.jst.jsf.context.symbol</package><package>org.eclipse.jst.jsf.context.symbol.provider</package><package>org.eclipse.jst.jsf.context.symbol.source</package><package>org.eclipse.jst.jsf.core</package><package>org.eclipse.jst.jsf.core.jsfappconfig</package><package>org.eclipse.jst.jsf.core.jsflibraryconfiguration</package><package>org.eclipse.jst.jsf.core.jsflibraryregistry</package><package>org.eclipse.jst.jsf.core.set.constraint</package><package>org.eclipse.jst.jsf.core.set.mapping</package><package>org.eclipse.jst.jsf.core.tagmatcher</package><package>org.eclipse.jst.jsf.designtime</package><package>org.eclipse.jst.jsf.designtime.context</package><package>org.eclipse.jst.jsf.designtime.el</package><package>org.eclipse.jst.jsf.designtime.resolver</package><package>org.eclipse.jst.jsf.designtime.symbols</package><package>org.eclipse.jst.jsf.facesconfig.edit.provider</package><package>org.eclipse.jst.jsf.facesconfig.emf</package><package>org.eclipse.jst.jsf.facesconfig.emf.impl</package><package>org.eclipse.jst.jsf.facesconfig.emf.util</package><package>org.eclipse.jst.jsf.metadataprocessors</package><package>org.eclipse.jst.jsf.metadataprocessors.features</package><package>org.eclipse.jst.jsf.taglibprocessing.attributevalues</package><package>org.eclipse.jst.pagedesigner.converter</package><package>org.eclipse.jst.pagedesigner.dtmanager</package><package>org.eclipse.jst.pagedesigner.dtmanager.converter</package><package>org.eclipse.jst.pagedesigner.dtmanager.converter.operations</package><package>org.eclipse.jst.pagedesigner.dtmanager.dtinfo</package><package>org.eclipse.jst.pagedesigner.editors.properties</package><package>org.eclipse.jst.pagedesigner.editors.properties.quickedittabsections</package><package>org.eclipse.jst.pagedesigner.extensionpoint</package></packages>
\ No newline at end of file
+<packages><package></package><package>org.eclipse.jst.jsf.common.dom</package><package>org.eclipse.jst.jsf.common.internal.componentcore</package><package>org.eclipse.jst.jsf.common.internal.finder.acceptor</package><package>org.eclipse.jst.jsf.common.internal.finder.matcher</package><package>org.eclipse.jst.jsf.common.internal.util</package><package>org.eclipse.jst.jsf.common.metadata</package><package>org.eclipse.jst.jsf.common.metadata.query</package><package>org.eclipse.jst.jsf.common.metadata.traittypes.traittypes</package><package>org.eclipse.jst.jsf.common.sets</package><package>org.eclipse.jst.jsf.common.sets.constraint</package><package>org.eclipse.jst.jsf.common.sets.mapping</package><package>org.eclipse.jst.jsf.common.util</package><package>org.eclipse.jst.jsf.context</package><package>org.eclipse.jst.jsf.context.resolver</package><package>org.eclipse.jst.jsf.context.resolver.structureddocument</package><package>org.eclipse.jst.jsf.context.structureddocument</package><package>org.eclipse.jst.jsf.context.symbol</package><package>org.eclipse.jst.jsf.context.symbol.provider</package><package>org.eclipse.jst.jsf.context.symbol.source</package><package>org.eclipse.jst.jsf.core</package><package>org.eclipse.jst.jsf.core.jsfappconfig</package><package>org.eclipse.jst.jsf.core.jsflibraryconfiguration</package><package>org.eclipse.jst.jsf.core.jsflibraryregistry</package><package>org.eclipse.jst.jsf.core.set.constraint</package><package>org.eclipse.jst.jsf.core.set.mapping</package><package>org.eclipse.jst.jsf.core.tagmatcher</package><package>org.eclipse.jst.jsf.designtime</package><package>org.eclipse.jst.jsf.designtime.context</package><package>org.eclipse.jst.jsf.designtime.el</package><package>org.eclipse.jst.jsf.designtime.resolver</package><package>org.eclipse.jst.jsf.designtime.symbols</package><package>org.eclipse.jst.jsf.facesconfig.edit.provider</package><package>org.eclipse.jst.jsf.facesconfig.emf</package><package>org.eclipse.jst.jsf.facesconfig.emf.impl</package><package>org.eclipse.jst.jsf.facesconfig.emf.util</package><package>org.eclipse.jst.jsf.metadataprocessors</package><package>org.eclipse.jst.jsf.metadataprocessors.features</package><package>org.eclipse.jst.jsf.taglibprocessing.attributevalues</package><package>org.eclipse.jst.pagedesigner.converter</package><package>org.eclipse.jst.pagedesigner.dtmanager</package><package>org.eclipse.jst.pagedesigner.dtmanager.converter</package><package>org.eclipse.jst.pagedesigner.dtmanager.converter.operations</package><package>org.eclipse.jst.pagedesigner.dtmanager.dtinfo</package><package>org.eclipse.jst.pagedesigner.editors.properties</package><package>org.eclipse.jst.pagedesigner.editors.properties.quickedittabsections</package><package>org.eclipse.jst.pagedesigner.extensionpoint</package></packages>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/plugins.xml b/plugins/org.eclipse.jst.jsf.doc.dev/plugins.xml
index c3a2a0b..cfa7700 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/plugins.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/plugins.xml
@@ -1,5 +1,7 @@
 org.eclipse.jst.jsf.core;
 org.eclipse.jst.jsf.ui;
+org.eclipse.jst.jsf.facelet.core;
+org.eclipse.jst.jsf.facelet.ui;
 org.eclipse.jst.jsf.facesconfig;
 org.eclipse.jst.jsf.facesconfig.ui;
 org.eclipse.jst.jsf.common;
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/srcFolders.txt b/plugins/org.eclipse.jst.jsf.doc.dev/srcFolders.txt
index 12243ce..a03854c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/srcFolders.txt
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/srcFolders.txt
@@ -1,5 +1,7 @@
 /org.eclipse.jst.jsf.core/src;
 /org.eclipse.jst.jsf.ui/src;
+/org.eclipse.jst.jsf.facelet.core/src;
+/org.eclipse.jst.jsf.facelet.ui/src;
 /org.eclipse.jst.jsf.facesconfig/facesconfig;
 /org.eclipse.jst.jsf.facesconfig.ui/src;
 /org.eclipse.jst.jsf.common/src;