Patch for PMC approved bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=193197
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
new file mode 100644
index 0000000..47e5ad8
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
@@ -0,0 +1,32 @@
+################################################################
+# Information for extension point overview document
+################################################################
+# Overview document title
+title = JavaServer Faces Extension Points
+header = JSF Extension Points 
+# Introduction paragraph
+overview = The following extension points can be used to extend the capabilities of the JSF infrastructure: 
+
+# A list of the extension points that should be included in the
+# extension point documentation.
+listed-ext-points=org.eclipse.jst.jsf.common.annotationFiles,\
+	org.eclipse.jst.jsf.common.contextSymbolFactory,\
+	org.eclipse.jst.jsf.common.domainLoadingStrategies,\
+	org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators,\
+	org.eclipse.jst.jsf.common.domainSourceModelTypes,\
+	org.eclipse.jst.jsf.common.standardMetaDataFiles,\
+	org.eclipse.jst.jsf.common.symbolSourceProvider,\
+	org.eclipse.jst.jsf.core.AttributeValueRuntimeTypes,\
+	org.eclipse.jst.jsf.core.MetaDataEnabledFeatures,\
+	org.eclipse.jst.jsf.core.externalcontext,\
+	org.eclipse.jst.jsf.core.jsfLibraries,\
+	org.eclipse.jst.jsf.core.methodresolver,\
+	org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries,\
+	org.eclipse.jst.jsf.core.propertyresolver,\
+	org.eclipse.jst.jsf.core.variableresolver,\
+	org.eclipse.jst.pagedesigner.cmRegistry,\
+	org.eclipse.jst.pagedesigner.pageDesignerExtension,\
+	org.eclipse.jst.pagedesigner.popupMenuContributor,\
+	org.eclipse.jst.pagedesigner.propertyContributor,\
+	org.eclipse.jst.pagedesigner.propertySections,\
+	org.eclipse.jst.pagedesigner.tagCreationFactories
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.xml b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.xml
new file mode 100644
index 0000000..8e69fc9
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Build Extension Point Documentation" default="createExtDocs" basedir=".">
+
+	<property file="buildExtDocs.properties"/>
+	<property name="outputDir" value="${basedir}${file.separator}html${file.separator}extpts_reference"/>
+	<property name="jsfOutputDir" value="${outputDir}${file.separator}jsf${file.separator}"/>
+
+	<taskdef name="pde.convertSchemaToHTML" classname="org.eclipse.pde.internal.core.ant.ConvertSchemaToHTML"/>
+	
+	<target name="createExtDocs" depends="buildExtDocs, createDocListings"/>
+	
+	<target name="buildExtDocs" depends="buildJSFExtDocs"/>
+	
+ 	<target name="buildJSFExtDocs">
+ 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.jsf.common/plugin.xml" destination="${jsfOutputDir}" />
+ 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.jsf.core/plugin.xml" destination="${jsfOutputDir}" />
+ 		<pde.convertSchemaToHTML manifest="../org.eclipse.jst.pagedesigner/plugin.xml" destination="${jsfOutputDir}" />
+ 		
+ 		<!-- Get the list of extension doc files. -->
+ 		<fileset dir="${jsfOutputDir}" casesensitive="yes" id="ext-docs-list-ent">
+ 			<include name="*.html"/>
+ 		</fileset>
+ 		 						
+ 		<!-- Convert the list to an XML representation. -->
+ 		<pathconvert property="ext-doc-ent" refid="ext-docs-list-ent" pathsep="&lt;/file&gt;&lt;file&gt;">
+ 			<map from="${jsfOutputDir}" to=""/>
+ 		</pathconvert>
+ 		<echo file="jsfextdocs.xml">&lt;files component="jsf"&gt;&lt;file&gt;${ext-doc-ent}&lt;/file&gt;&lt;/files&gt;</echo>
+ 		 						
+ 	</target>
+	
+	<target name="createDocListings">
+		<!-- Create the overview document. -->
+		<xslt basedir="${basedir}" in="extDocListings.xml" out="${outputDir}${file.separator}index.html" style="extDocOverview.xsl">
+	  		<param name="title" expression="${title}"/>
+	  		<param name="header" expression="${header}"/>
+	  		<param name="overview" expression="${overview}"/>
+			<param name="listed-ext-points" expression="${listed-ext-points}"/>
+		</xslt>
+			
+		<!-- Create the extention point toc. -->
+		<xslt basedir="${basedir}" in="extDocListings.xml" out="topics_ExtPoint_Reference.xml" style="extDocToc.xsl">
+			<param name="listed-ext-points" expression="${listed-ext-points}"/>
+			<outputproperty name="method" value="xml"/>
+			<outputproperty name="indent" value="yes"/>
+		</xslt>
+			
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/extDocListings.xml b/plugins/org.eclipse.jst.jsf.doc.dev/extDocListings.xml
new file mode 100644
index 0000000..23f2467
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/extDocListings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components>
+	<component name="JavaServer Faces Tools" id="jsf" file="jsfextdocs.xml"/>
+</components>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/extDocOverview.xsl b/plugins/org.eclipse.jst.jsf.doc.dev/extDocOverview.xsl
new file mode 100644
index 0000000..ffe0ef1
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/extDocOverview.xsl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    version="1.0"
+    xmlns:xalan="http://xml.apache.org/xslt">
+    <xsl:param name="title"/>
+    <xsl:param name="header"/>
+    <xsl:param name="overview"/>
+    <xsl:param name="listed-ext-points"/>
+    
+    <xsl:template match="components">
+    	
+    	<xsl:text disable-output-escaping="yes">
+    	&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"&gt;
+		</xsl:text>
+		<html>
+		<head>
+		<xsl:text disable-output-escaping="yes">
+		&lt;meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." &gt;
+
+   		&lt;meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"&gt;
+   		</xsl:text>
+   		<title><xsl:value-of select="$title"/></title>
+   		<xsl:text disable-output-escaping="yes">
+		&lt;LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css"&gt;
+		</xsl:text>
+		</head>
+		<body link="#0000FF" vlink="#800080">
+
+		<center>
+		<h1><xsl:value-of select="$header"/></h1>
+		</center>
+
+		<xsl:value-of select="$overview"/>
+    	<xsl:for-each select="component">
+    		<xsl:sort select="@id"/>
+    		<h3><a name="{@id}"></a><xsl:value-of select="@name"/></h3>
+    		<ul>
+    			<xsl:for-each select="document(@file)/files/file">
+    				<xsl:sort select="text()"/>
+    				<xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
+  						<li>
+  							<a href="{../@component}/{text()}"><xsl:value-of select="translate(substring(text(), 0, string-length(text()) - 4),'_','.')"/></a> 
+  						</li>
+  					</xsl:if>
+    			</xsl:for-each>
+    		</ul>
+    	</xsl:for-each>
+    	</body>
+		</html>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/extDocToc.xsl b/plugins/org.eclipse.jst.jsf.doc.dev/extDocToc.xsl
new file mode 100644
index 0000000..ed62dac
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/extDocToc.xsl
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    version="1.0"
+    xmlns:xalan="http://xml.apache.org/xslt"
+    exclude-result-prefixes="xalan">
+    <xsl:param name="listed-ext-points"/>
+    
+     <xsl:template match="components">
+     	<xsl:text disable-output-escaping="yes">
+&lt;?NLS TYPE="org.eclipse.help.toc"?&gt;
+	 	</xsl:text>
+	 	<toc label="Extension Points Reference">
+	 		<xsl:for-each select="document(component/@file)/files/file">
+	 			<xsl:sort select="text()"/>
+	 			<xsl:if test="contains($listed-ext-points, translate(substring(text(), 0, string-length(text()) - 4),'_','.'))">
+	 				<topic label="{translate(substring(text(), 0, string-length(text()) - 4),'_','.')}" href="html/extpts_reference/{../@component}/{text()}">
+	 				</topic>
+	 			</xsl:if>
+	 		</xsl:for-each>
+	 	</toc> 
+	</xsl:template>
+</xsl:stylesheet>
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 10df87b..53d2eb9 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
@@ -2,52 +2,81 @@
     	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
 		<html xmlns:xalan="http://xml.apache.org/xslt">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-		<meta name="copyright" content="Copyright (c) Oracle Corporation and others 2006. This page is made available under EPL license."/>
-   		<title>WTP JavaServer Faces Tools (JSF) Extension Points</title>
-		<link REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css"/>
-</head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+
+   		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   		<title>JavaServer Faces Extension Points</title>
+		<LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
+		</head>
 <body link="#0000FF" vlink="#800080">
 <center>
 <h1>JSF Extension Points </h1>
 </center>The following extension points can be used to extend the capabilities of the JSF infrastructure: <h3>
-<a name="jsf"></a>JavaServer Faces</h3>
+<a name="jsf"></a>JavaServer Faces Tools</h3>
 <ul>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_contentmodel_annotations_annotationFiles.html">org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles</a>
+<a href="jsf/org_eclipse_jst_jsf_common_annotationFiles.html">org.eclipse.jst.jsf.common.annotationFiles</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_context_symbol_contextSymbolFactory.html">org.eclipse.jst.jsf.context.symbol.contextSymbolFactory</a>
+<a href="jsf/org_eclipse_jst_jsf_common_contextSymbolFactory.html">org.eclipse.jst.jsf.common.contextSymbolFactory</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_context_symbol_symbolSourceProvider.html">org.eclipse.jst.jsf.context.symbol.symbolSourceProvider</a>
+<a href="jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html">org.eclipse.jst.jsf.common.domainLoadingStrategies</a>
+</li>
+<li>
+<a href="jsf/org_eclipse_jst_jsf_common_domainSourceModelTypes.html">org.eclipse.jst.jsf.common.domainSourceModelTypes</a>
+</li>
+<li>
+<a href="jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html">org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators</a>
+</li>
+<li>
+<a href="jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html">org.eclipse.jst.jsf.common.standardMetaDataFiles</a>
+</li>
+<li>
+<a href="jsf/org_eclipse_jst_jsf_common_symbolSourceProvider.html">org.eclipse.jst.jsf.common.symbolSourceProvider</a>
+</li>
+<li>
+<a href="jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html">org.eclipse.jst.jsf.core.AttributeValueRuntimeTypes</a>
+</li>
+<li>
+<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_jsfLibraries.html">org.eclipse.jst.jsf.core.jsfLibraries</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_designtime_externalcontext.html">org.eclipse.jst.jsf.designtime.externalcontext</a>
+<a href="jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html">org.eclipse.jst.jsf.core.MetaDataEnabledFeatures</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_designtime_methodresolver.html">org.eclipse.jst.jsf.designtime.methodresolver</a>
+<a href="jsf/org_eclipse_jst_jsf_core_methodresolver.html">org.eclipse.jst.jsf.core.methodresolver</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_designtime_propertyresolver.html">org.eclipse.jst.jsf.designtime.propertyresolver</a>
+<a href="jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html">org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_designtime_variableresolver.html">org.eclipse.jst.jsf.designtime.variableresolver</a>
+<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_facesconfig_common_introductionPage.html">org.eclipse.jst.jsf.facesconfig.common.introductionPage</a>
+<a href="jsf/org_eclipse_jst_jsf_core_variableresolver.html">org.eclipse.jst.jsf.core.variableresolver</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_facesconfig_common_overviewPage.html">org.eclipse.jst.jsf.facesconfig.common.overviewPage</a>
+<a href="jsf/org_eclipse_jst_pagedesigner_cmRegistry.html">org.eclipse.jst.pagedesigner.cmRegistry</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_metadataprocessors_AttributeValueRuntimeTypes.html">org.eclipse.jst.jsf.metadataprocessors.AttributeValueRuntimeTypes</a>
+<a href="jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html">org.eclipse.jst.pagedesigner.pageDesignerExtension</a>
 </li>
 <li>
-<a href="jsf/org_eclipse_jst_jsf_metadataprocessors_MetaDataEnabledFeatures.html">org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledFeatures</a>
+<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>
+<li>
+<a href="jsf/org_eclipse_jst_pagedesigner_propertySections.html">org.eclipse.jst.pagedesigner.propertySections</a>
+</li>
+<li>
+<a href="jsf/org_eclipse_jst_pagedesigner_tagCreationFactories.html">org.eclipse.jst.pagedesigner.tagCreationFactories</a>
 </li>
 </ul>
 </body>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_contentmodel_annotations_annotationFiles.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_annotationFiles.html
similarity index 86%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_contentmodel_annotations_annotationFiles.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_annotationFiles.html
index 9c28a84..e0628bb 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_contentmodel_annotations_annotationFiles.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_annotationFiles.html
@@ -8,12 +8,14 @@
 <BODY>
 <H1><CENTER>Annotation Files</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>WTP 1.5
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.common.annotationFiles<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
 <p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>Adds annotation meta-data to a content model.  An extending plugin may only create one annotation file for a given URI.</p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>Adds annotation meta-data to a content model.  An extending plugin may only create one annotation file for a given URI.
+
+<p><b>This extension point is provisional and subject to change</b></p></p>
 <p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
 <p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.annotationFile">annotationFile</a>+)&gt;</p>
 <p class=code id=dtd>&lt;!ATTLIST extension</p>
@@ -40,6 +42,10 @@
 
 <br>
 <p class=note id=copyright>
+Copyright 2006 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></p>
+
 </p>
 </BODY>
 </HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_contextSymbolFactory.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_contextSymbolFactory.html
similarity index 98%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_contextSymbolFactory.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_contextSymbolFactory.html
index 5a8eea6..8127cc0 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_contextSymbolFactory.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_contextSymbolFactory.html
@@ -8,7 +8,7 @@
 <BODY>
 <H1><CENTER>Contextual Symbol Factory</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.context.symbol.contextSymbolFactory<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.common.contextSymbolFactory<p></p>
 <h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html
new file mode 100644
index 0000000..2c1f0a5
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html
@@ -0,0 +1,51 @@
+<!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>DomainLoadingStrategies</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>DomainLoadingStrategies</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.common.DomainLoadingStrategies<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>** Should be considered internal at this time.   Subject to change **
+Allows for naming domains of metadata and binding to classes that can load sources of metadata into that domain.   A domain is a set of entities using jsf.common.metadata model.  In initial release, Tag Library domain will be supplied.  Tag files, Tags, attributes are the known entities on this domain, as an example.</p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.domainLoader">domainLoader</a>)*&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.domainLoader">domainLoader</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST domainLoader</p>
+<p class=code id=dtdAttlist>domainId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>domainLoadingStrategy&nbsp;CDATA #REQUIRED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>domainId</b> - Key used to name this domain.</li>
+<li><b>domainLoadingStrategy</b> - Fully qualified java class implementing <code>org.eclipse.jst.jsf.common.metadata.IDomainLoadingStrategy</code> that will be used to load an instance of a metadata model.
+
+Implementing class requires a constructor taking the domainID String.</li>
+</ul>
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6><extension
+         point="org.eclipse.jst.jsf.common.domainLoadingStrategies">
+      <domainLoader
+            domainId="TagLibraryDomain"
+         domainLoadingStrategy="org.eclipse.jst.jsf.common.metadata.internal.JSPTagLibDomainLoadingStrategy"/>
+   </extension>
+<p></p>
+
+<br>
+<p class=note id=copyright>
+Copyright 2007 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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html
new file mode 100644
index 0000000..328bad4
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html
@@ -0,0 +1,50 @@
+<!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>DomainSourceModelTypeTranslators</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>DomainSourceModelTypeTranslators</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.common.DomainSourceModelTypeTranslators<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>** Should be considered internal at this time.   Subject to change **
+Allows for metadata domain translators to be applied to a metadata domain source type.</p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.domainSourceModelTypeTranslator">domainSourceModelTypeTranslator</a>)*&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.domainSourceModelTypeTranslator">domainSourceModelTypeTranslator</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST domainSourceModelTypeTranslator</p>
+<p class=code id=dtdAttlist>domainSourceModelTypeId&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>translatorClass&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>domainSourceModelTypeId</b> - The unique id from the domainSourceModelTypes ext-pt that will bind the translator class to that domain source.</li>
+<li><b>translatorClass</b> - Fully qualified class implementing <code>org.eclipse.jst.jsf.common.metadata.IMetaDataTranslator</code> that will translate from the source domain to the "standard" domain of entities and traits.</li>
+</ul>
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6><extension
+         point="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators">
+      <domainSourceModelTypeTranslator
+            class="org.eclipse.jst.jsf.common.metadata.internal.TaglibMetaDataTLDTranslator"
+            domainSourceModelTypeId="TagLibMetaDataTagLibraryHandler">
+      </domainSourceModelTypeTranslator>
+   </extension>
+<p></p>
+
+<br>
+<p class=note id=copyright>
+Copyright 2007 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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypes.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypes.html
new file mode 100644
index 0000000..5a822dc
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypes.html
@@ -0,0 +1,43 @@
+<!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 Source Model Types</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>Metadata Domain Source Model Types</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.common.domainSourceModelTypes<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>** Should be considered internal at this time.   Subject to change **
+Binds metadata source types to a particular domain of metadata.</p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.domainSourceModelTypes">domainSourceModelTypes</a>)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.domainSourceModelTypes">domainSourceModelTypes</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST domainSourceModelTypes</p>
+<p class=code id=dtdAttlist>domainSourceModelTypeId&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>domainId&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>locator&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>ordinal&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>domainSourceModelTypeId</b> - Uniquely identifies this combination of domain and source metadata locator.  This id should be used by the domainSourceModelTypeTranslator ext-pt.</li>
+<li><b>domainId</b> - The DomainLoadingStrategy domainId that this source is being bound to.</li>
+<li><b>locator</b> - A class implementing <code>IMetaDataLocator</code> that is responsible for finding instances of metadata.</li>
+<li><b>ordinal</b> - An optional integer ordinal that is used to prioritize a source if the domain loading strategy does not supply it's own sorting.  The higher the number, the higher the priority.</li>
+</ul>
+<br><br>
+<p class=note id=copyright>
+Copyright 2007 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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html
new file mode 100644
index 0000000..ffe5719
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html
@@ -0,0 +1,56 @@
+<!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>StandardMetaDataFiles</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>StandardMetaDataFiles</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.common.StandardMetaDataFiles<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>Defines a file of metadata for a given URI in "standard" form loadable by <code>org.eclipse.jst.jsf.common.metadata model</code>
+
+<p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.standardMetaDataFile">standardMetaDataFile</a>+)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.standardMetaDataFile">standardMetaDataFile</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST standardMetaDataFile</p>
+<p class=code id=dtdAttlist>uri&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>location&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>locator&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<p class=ConfigMarkup id=elementDesc>
+Mapping of a namespace URI to an XML file loadable by a standard metadata EMF model defined by <code>http://org.eclipse.jst.jsf.common.metadata/metadata.ecore</code>.     See <code>org.eclipse.jst.jsf.standard.tagsupport</code> plugin and the /metadata/jsf_core.xml file.</p>
+<br>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>uri</b> - Content model URI being annotated.  eg.  "http://java.sun.com/jsf/core".   This can, of course, be any string that the consumer wishes to use as a key.</li>
+<li><b>location</b> - Location of the annotation file.   If no locator is provided, it will use the default <code>PluginRelativeStandardMetaDataSourceFileLocator</code> which will find the file in a location relative to the plugin.
+eg. /metadata/jsf_core.xml</li>
+<li><b>locator</b> - Class extending <code>org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator</code> that will be used to locate the standard metadata file.</li>
+</ul>
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6><extension
+         point="org.eclipse.jst.jsf.common.standardMetaDataFiles">
+      <standardMetaDataFile
+            location="/metadata/JSF_HTML.xml"
+            uri="http://java.sun.com/jsf/html">
+      </standardMetaDataFile>
+   </extension>
+<p></p>
+
+<br>
+<p class=note id=copyright>
+Copyright 2007 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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_symbolSourceProvider.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_symbolSourceProvider.html
similarity index 98%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_symbolSourceProvider.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_symbolSourceProvider.html
index 03812ea..cc83bec 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_symbolSourceProvider.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_symbolSourceProvider.html
@@ -8,7 +8,7 @@
 <BODY>
 <H1><CENTER>Symbol Source Provider</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.context.symbol.symbols<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.common.symbols<p></p>
 <h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_metadataprocessors_AttributeValueRuntimeTypes.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
similarity index 88%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_metadataprocessors_AttributeValueRuntimeTypes.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
index a7717d2..159d6a7 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_metadataprocessors_AttributeValueRuntimeTypes.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
@@ -8,12 +8,14 @@
 <BODY>
 <H1><CENTER>AttributeValueRuntimeTypes</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.metadataprocessors.AttributeValueRuntimeTypes<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>WTP 1.5
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.AttributeValueRuntimeTypes<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
 <p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>Defines a mapping between an implementing class and an AttributeValue Runtime type.   By categorizing attribute values types in an CMAnnotation file, we can assign types and therefore processing of those types using the CMAnnotation file metadata and context information.</p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>Defines a mapping between an implementing class and an AttributeValue Runtime type.   By categorizing attribute values types in an CMAnnotation file, we can assign types and therefore processing of those types using the CMAnnotation file metadata and context information.
+
+<p><b>This extension point is provisional and subject to change</b></p></p>
 <p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
 <p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.attributeValueRuntimeType">attributeValueRuntimeType</a>+)&gt;</p>
 <p class=code id=dtd>&lt;!ATTLIST extension</p>
@@ -30,7 +32,7 @@
 <br>
 <ul class=ConfigMarkup id=attlistDesc>
 <li><b>id</b> - unique id for the type within the extending plugin</li>
-<li><b>class</b> - Class that will be used to implement the type.  It must implement <code>org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature</code> and it is recommended that the user extend the <code>org.eclipse.jst.jsf.metadataprocessors.internal.provisional.AbstractRootTypeDescriptor</code> or one of its subclasses.</li>
+<li><b>class</b> - Class that will be used to implement the type.  It must implement <code>org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature</code> and it is recommended that the user extend the <code>org.eclipse.jst.jsf.metadataprocessors.AbstractRootTypeDescriptor</code> or one of its subclasses.</li>
 </ul>
 <br><h6 class=CaptionFigColumn id=header>Examples: </h6>see org.eclipse.jst.jsf.taglibprocessing plugin for examples of usage
 <p></p>
@@ -45,10 +47,11 @@
 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
-<br> 
+ 
 Contributors:
     Gerry Kessler/Oracle - initial API and implementation
 <p></p>
+
 </p>
 </BODY>
 </HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_metadataprocessors_MetaDataEnabledFeatures.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html
similarity index 89%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_metadataprocessors_MetaDataEnabledFeatures.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html
index 4d4a61a..1f8269b 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_metadataprocessors_MetaDataEnabledFeatures.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html
@@ -8,12 +8,14 @@
 <BODY>
 <H1><CENTER>MetaData Enabled Features</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledFeatures<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>WTP 1.5
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.MetaDataEnabledFeatures<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
 <p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>Defines a mapping between a runtime type defined by a different plugin and an implementing class in the extenders plugin.   This allows a provider to provide additional processing on an element or attribute instance that can be in addition to existing processing or a means to provide a new kind of processing of existing runtime types.</p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>Defines a mapping between a runtime type defined by a different plugin and an implementing class in the extenders plugin.   This allows a provider to provide additional processing on an element or attribute instance that can be in addition to existing processing or a means to provide a new kind of processing of existing runtime types.
+
+<p><b>This extension point is provisional and subject to change</b></p></p>
 <p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
 <p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.MetaDataEnabledFeature">MetaDataEnabledFeature</a>+)&gt;</p>
 <p class=code id=dtd>&lt;!ATTLIST extension</p>
@@ -30,7 +32,7 @@
 <br>
 <ul class=ConfigMarkup id=attlistDesc>
 <li><b>typeid</b> - Fully qualified runtime type id</li>
-<li><b>class</b> - Fully qualified implementing class that must implement <code>org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature</code>.</li>
+<li><b>class</b> - Fully qualified implementing class that must implement <code>org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature</code>.</li>
 </ul>
 <br><br>
 <p class=note id=copyright>
@@ -39,10 +41,11 @@
 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
-<br> 
+ 
 Contributors:
     Gerry Kessler/Oracle - initial API and implementation
 <p></p>
+
 </p>
 </BODY>
 </HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_externalcontext.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_externalcontext.html
similarity index 95%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_externalcontext.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_externalcontext.html
index 73b723a..fc7967d 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_externalcontext.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_externalcontext.html
@@ -8,8 +8,8 @@
 <BODY>
 <H1><CENTER>External Context</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.designtime.externalcontext<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>1.0
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.externalcontext<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
 <p>
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 8da2617..dd78dec 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
@@ -9,11 +9,12 @@
 <H1><CENTER>JSF Libraries</CENTER></H1>
 <p></p>
 <h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.jsfLibraries<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>JSF M1
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
 <p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>This extension point allows clients to create named sets of jars for use with JavaServer Faces Applications.</p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>This extension point allows clients to create named sets of jars for use with JavaServer Faces Applications.
+<b>Deprecated</b> - adopters should now use <code>org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries</code></p>
 <p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
 <p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.jsfLibrary">jsfLibrary</a>*)&gt;</p>
 <p class=code id=dtd>&lt;!ATTLIST extension</p>
@@ -26,15 +27,15 @@
 <p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>isImplementation&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>maxVersionSupported&nbsp;&nbsp;(v1_1|v1_2|UNKNOWN) <p class=code id=dtdAttlist>archiveFilesDelegate&nbsp;CDATA #REQUIRED&gt;</p>
 <p></p>
 <p class=ConfigMarkup id=elementDesc>
-A named collection of jars that can be copied as a unit to WEB-INF/lib.</p>
+A named collection of jars that will be added to the classpath as a classpath container to a project that references it.</p>
 <br>
 <ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - A unique name for the library that will be displayed to an end user.</li>
+<li><b>name</b> - A unique name for the library.</li>
 <li><b>isImplementation</b> - Flag indicating that this libary is declared to be a JSF implementation and not just a JSF component library.</li>
 <li><b>maxVersionSupported</b> - Used to declare which JSF specification this library will support.</li>
-<li><b>archiveFilesDelegate</b> - class that must extend org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry.JSFLibraryArchiveFilesDelegate to supply a collection of ArchiveFiles for the library</li>
+<li><b>archiveFilesDelegate</b> - class that must extend org.eclipse.jst.jsf.core.jsflibraryregistry.JSFLibraryArchiveFilesDelegate to supply a collection of ArchiveFiles for the library</li>
 </ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6>The following is an example of a jsfLibrary extension point:
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6>The following is an example of usage of pluginProvidedJsfLibraries extension point:
 
 <p>
 <pre>
@@ -49,7 +50,7 @@
 </p>
 <p></p>
 
-<h6 class=CaptionFigColumn id=header>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.internal.provisional.jsflibraryregistry.JSFLibraryArchiveFilesDelegate</code> and has a public 0-arg constructor.
+<h6 class=CaptionFigColumn id=header>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 id=header>Supplied Implementation: </h6>none
@@ -57,15 +58,16 @@
 
 <br>
 <p class=note id=copyright>
-Copyright (c) 2005 Oracle Corporation.
+Copyright (c) 2005, 2007 Oracle Corporation.
 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
-<br>
+
 Contributors:
 Gerry Kessler - initial API and implementation
 <p></p>
+
 </p>
 </BODY>
 </HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_methodresolver.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_methodresolver.html
similarity index 96%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_methodresolver.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_methodresolver.html
index 44794b3..2efc06a 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_methodresolver.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_methodresolver.html
@@ -8,8 +8,8 @@
 <BODY>
 <H1><CENTER>Method Resolver</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.designtime.methodresolver<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>1.0
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.methodresolver<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></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
new file mode 100644
index 0000000..52380ce
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html
@@ -0,0 +1,76 @@
+<!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 Libraries</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>JSF Libraries</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6>This extension point allows clients to create named sets of jars for use with JavaServer Faces Applications.
+
+<p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.jsfLibrary">jsfLibrary</a>*)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.jsfLibrary">jsfLibrary</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST jsfLibrary</p>
+<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>label&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>isImplementation&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(true | false) <p class=code id=dtdAttlist>maxVersionSupported&nbsp;&nbsp;(v1_1|v1_2|UNKNOWN) <p class=code id=dtdAttlist>archiveFilesDelegate&nbsp;CDATA #REQUIRED&gt;</p>
+<p></p>
+<p class=ConfigMarkup id=elementDesc>
+A named collection of jars that will be added to the classpath as a classpath container to a project that references it.</p>
+<br>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>name</b> - A unique, non-translatable, name for the library.  The plugin developer is responsible for ensuring uniqueness within the plugin.  This name, in combination with the plugin id, is used to identify the classpath container reference.</li>
+<li><b>label</b> - Translatable string for displaying the library name.</li>
+<li><b>isImplementation</b> - Flag indicating that this libary is declared to be a JSF implementation and not just a JSF component library.</li>
+<li><b>maxVersionSupported</b> - Used to declare which JSF specification this library will support.</li>
+<li><b>archiveFilesDelegate</b> - class that must extend org.eclipse.jst.jsf.core.jsflibraryregistry.JSFLibraryArchiveFilesDelegate to supply a collection of IPaths to jars in the library</li>
+</ul>
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6>The following is an example of usage of pluginProvidedJsfLibraries extension point:
+
+<p>
+<pre>
+  <p class=code id=tag>&lt;extension point=<p class=code id=cstring>&quot;org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries&quot;</p><p class=code id=tag>&gt;</p>
+    <p class=code id=tag>&lt;jsfLibrary       
+       name=<p class=code id=cstring>&quot;MyComponentLib1&quot;</p><p class=code id=tag>
+       label=<p class=code id=cstring>&quot;%MyComponentLib1.translatableLabel&quot;</p><p class=code id=tag>
+       isImplementation=<p class=code id=cstring>&quot;false&quot;</p><p class=code id=tag>
+       maxVersionSupported=<p class=code id=cstring>&quot;v1_1&quot;</p><p class=code id=tag>
+       archiveFilesDelegate=<p class=code id=cstring>&quot;com.acme.jsf.libraries.MyComponentLibraryFiles&quot;</p><p class=code id=tag>/&gt;</p>
+  <p class=code id=tag>&lt;/extension&gt;</p>
+</pre>
+</p>
+<p></p>
+
+<h6 class=CaptionFigColumn id=header>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.PluginProvidedJSFLibraryJarFilesDelegate</code> and has a public 0-arg constructor.
+<p></p>
+
+<h6 class=CaptionFigColumn id=header>Supplied Implementation: </h6>none
+<p></p>
+
+<br>
+<p class=note id=copyright>
+Copyright (c) 2007 Oracle Corporation.
+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
+
+Contributors:
+Gerry Kessler - initial API and implementation
+<p></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_propertyresolver.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_propertyresolver.html
similarity index 96%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_propertyresolver.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_propertyresolver.html
index ff99891..342edd0 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_propertyresolver.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_propertyresolver.html
@@ -8,8 +8,8 @@
 <BODY>
 <H1><CENTER>Property Resolver</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.designtime.propertyresolver<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>1.0
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.propertyresolver<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
 <p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_variableresolver.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_variableresolver.html
similarity index 96%
rename from plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_variableresolver.html
rename to plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_variableresolver.html
index 499bd79..6dc6a6c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_variableresolver.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_variableresolver.html
@@ -8,8 +8,8 @@
 <BODY>
 <H1><CENTER>Variable Resolver</CENTER></H1>
 <p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.designtime.variableresolver<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>1.0
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.core.variableresolver<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>1.5
 <p></p>
 
 <p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_introductionPage.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_introductionPage.html
deleted file mode 100644
index 4508bd6..0000000
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_introductionPage.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!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>Introduction Page</title>
-<style>@import url("../../book.css");</style>
-<style>@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1><CENTER>Introduction Page</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.facesconfig.common.introductionPage<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>1.0.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>The purpose of this extension point is to allow plug-ins to describe the contents and links on a introduction page of an editor.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.introductionpage">introductionpage</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>point</b> - a fully qualified identifier of the target extension point.</li>
-<li><b>id</b> - identifier of the extension instance, this should be the same as the editor id.</li>
-<li><b>name</b> - an optional name of the extension instance. Normally this is the editor name.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.introductionpage">introductionpage</a> (<a href="#e.introductionelement">introductionelement</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST introductionpage</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>description&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-The details for an introduction page for a specific plugins editor</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - The name of the page.</li>
-<li><b>description</b> - A description for the page.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.introductionelement">introductionelement</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST introductionelement</p>
-<p class=code id=dtdAttlist>icon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>heading&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>hyperlink&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>hyperlinkaction&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>actionparameters&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-An element that make up a section of the page. Elements can contain Headers, Hyperlinks, Icons and text.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>icon</b> - An icon to display in the element. The icon should be 72x72 and will appear to the left of the headers, hyperlinks and text</li>
-<li><b>heading</b> - A short heading for the element (optional)</li>
-<li><b>text</b> - The text description for the element</li>
-<li><b>hyperlink</b> - A hyperlink associated with the element. The hyperlink would normally execute the hyperlinkaction action</li>
-<li><b>hyperlinkaction</b> - The action associated with the hyperlink. This is an action that will be executed when the hyperlink is selected</li>
-<li><b>actionparameters</b> - Can be used to pass one or more parameters to the hyperlink action. Parameter must be space separated (optional)</li>
-</ul>
-
-<p></p>
-
-<br>
-<p class=note id=copyright>
-Copyright (c) 2004, 2006 Sybase, Inc. and others. <br>
- All rights reserved. This program and the accompanying materials <br>
- are made available under the terms of the Eclipse Public License v1.0 <br>
- which accompanies this distribution, and is available at <br>
- http://www.eclipse.org/legal/epl-v10.html <br>
- 
-  Contributors: <br>
-      Sybase, Inc. - initial API and implementation <br>
-<p></p>
-
-</p>
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_overviewPage.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_overviewPage.html
deleted file mode 100644
index 83fa084..0000000
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_overviewPage.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!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>Overview Page</title>
-<style>@import url("../../book.css");</style>
-<style>@import url("../../schema.css");</style>
-</HEAD>
-<BODY>
-<H1><CENTER>Overview Page</CENTER></H1>
-<p></p>
-<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.jsf.facesconfig.common.overviewPage<p></p>
-<h6 class=CaptionFigColumn id=header>Since: </h6>1.0.0
-<p></p>
-
-<p>
-<h6 class=CaptionFigColumn id=header>Description: </h6>The purpose of this extension point is to allow plug-ins to describe the contents and links on a overview page of an editor.</p>
-<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
-<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.overviewpage">overviewpage</a>)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST extension</p>
-<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>point</b> - a fully qualified identifier of the target extension point.</li>
-<li><b>id</b> - identifier of the extension instance, this should be the same as the editor id.</li>
-<li><b>name</b> - an optional name of the extension instance. Normally this is the editor name.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.overviewpage">overviewpage</a> (<a href="#e.overviewelement">overviewelement</a>+)&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST overviewpage</p>
-<p class=code id=dtdAttlist>name&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>description&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-The details for an overview page for a specific plugins editor</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>name</b> - The name of the page.</li>
-<li><b>description</b> - A description for the page.</li>
-</ul>
-<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.overviewelement">overviewelement</a> EMPTY&gt;</p>
-<p class=code id=dtd>&lt;!ATTLIST overviewelement</p>
-<p class=code id=dtdAttlist>icon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>heading&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>text&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>hyperlink&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>hyperlinkaction&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>actionparameters&nbsp;CDATA #IMPLIED&gt;</p>
-<p></p>
-<p class=ConfigMarkup id=elementDesc>
-An element that make up a section of the page. Elements can contain Headers, Hyperlinks, Icons and text.</p>
-<br>
-<ul class=ConfigMarkup id=attlistDesc>
-<li><b>icon</b> - An icon to display in the element. The icon should be 72x72 and will appear to the left of the headers, hyperlinks and text</li>
-<li><b>heading</b> - A short heading for the element (optional)</li>
-<li><b>text</b> - The text description for the element</li>
-<li><b>hyperlink</b> - A hyperlink associated with the element. The hyperlink would normally execute the hyperlinkaction action</li>
-<li><b>hyperlinkaction</b> - The action associated with the hyperlink. This is an action that will be executed when the hyperlink is selected</li>
-<li><b>actionparameters</b> - Can be used to pass one or more parameters to the hyperlink action. Parameter must be space separated (optional)</li>
-</ul>
-
-<p></p>
-
-<br>
-<p class=note id=copyright>
-Copyright (c) 2004, 2006 Sybase, Inc. and others. <br>
- All rights reserved. This program and the accompanying materials <br>
- are made available under the terms of the Eclipse Public License v1.0 <br>
- which accompanies this distribution, and is available at <br>
- http://www.eclipse.org/legal/epl-v10.html <br>
- 
-  Contributors: <br>
-      Sybase, Inc. - initial API and implementation <br>
-<p></p>
-
-</p>
-</BODY>
-</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_cmRegistry.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_cmRegistry.html
new file mode 100644
index 0000000..b52cacc
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_cmRegistry.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>Content Model Meta Data</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>Content Model Meta Data</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.pagedesigner.cmRegistry<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6><p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.registry">registry</a>*)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.registry">registry</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST registry</p>
+<p class=code id=dtdAttlist>configFile&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>uri&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED&gt;</p>
+<p></p>
+<p class=ConfigMarkup id=elementDesc>
+User must provide either "configFile" attribute or "class" attribute.</p>
+<br>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>configFile</b> - A path relative to the root of the declaring plugin. Point to a config file that contains the information for the specified tag lib of the uri.</li>
+<li><b>class</b> - A class that implements ICMRegistry. The implemented ICMRegistry must return the same uri as the uri attribute in getSupportedURI() method.</li>
+<li><b>uri</b> - </li>
+</ul>
+<br><br>
+<p class=note id=copyright>
+Copyright 2006 Sybase and others
+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></p>
+
+</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
new file mode 100644
index 0000000..caf5675
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html
@@ -0,0 +1,68 @@
+<!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>Web Page Editor Extension</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>Web Page Editor Extension</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.pagedesigner.pageDesignerExtension<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6><p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&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>*)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.localDropHandler">localDropHandler</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST localDropHandler</p>
+<p class=code id=dtdAttlist>class&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>class</b> - </li>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.attributeCellEditorFactory">attributeCellEditorFactory</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST attributeCellEditorFactory</p>
+<p class=code id=dtdAttlist>class&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>class</b> - </li>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.tagConverterFactory">tagConverterFactory</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST tagConverterFactory</p>
+<p class=code id=dtdAttlist>class&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>class</b> - </li>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.elementEditFactory">elementEditFactory</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST elementEditFactory</p>
+<p class=code id=dtdAttlist>class&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>class</b> - </li>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.linkCreator">linkCreator</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST linkCreator</p>
+<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>linkIdentifier&nbsp;CDATA #REQUIRED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>class</b> - </li>
+<li><b>linkIdentifier</b> - </li>
+</ul>
+<br><br>
+<p class=note id=copyright>
+Copyright 2006 Sybase and others
+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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_popupMenuContributor.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_popupMenuContributor.html
new file mode 100644
index 0000000..f7d8560
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_popupMenuContributor.html
@@ -0,0 +1,40 @@
+<!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>popupMenu Contributor</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>popupMenu Contributor</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.pagedesigner.popupMenuContributor<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6><p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.menuItemContributor">menuItemContributor</a>+)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.menuItemContributor">menuItemContributor</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST menuItemContributor</p>
+<p class=code id=dtdAttlist>class&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>URI&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>class</b> - </li>
+<li><b>URI</b> - </li>
+</ul>
+<br><br>
+<p class=note id=copyright>
+Copyright 2006 Sybase and others
+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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertyContributor.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertyContributor.html
new file mode 100644
index 0000000..98629bd
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertyContributor.html
@@ -0,0 +1,39 @@
+<!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>property contributor</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>property contributor</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.pagedesigner.propertyContributor<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6><p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.propertyContributor">propertyContributor</a>*)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.propertyContributor">propertyContributor</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST propertyContributor</p>
+<p class=code id=dtdAttlist>sectionDescriptorProvider&nbsp;CDATA #REQUIRED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>sectionDescriptorProvider</b> - </li>
+</ul>
+<br><br>
+<p class=note id=copyright>
+Copyright 2006 Sybase and others
+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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertySections.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertySections.html
new file mode 100644
index 0000000..1e9923a
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertySections.html
@@ -0,0 +1,57 @@
+<!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>Property Sections</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>Property Sections</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.pagedesigner.propertySections<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6><p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.propertySections">propertySections</a>)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>point</b> - The identifier of the extension point, i.e. <tt>org.eclipse.wst.ui.properties.propertySections</tt></li>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.propertySections">propertySections</a> (<a href="#e.propertySection">propertySection</a>+)&gt;</p>
+<p></p>
+<br><br>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.propertySection">propertySection</a> (<a href="#e.tagFilter">tagFilter</a>*)&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST propertySection</p>
+<p class=code id=dtdAttlist>tab&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>class&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>afterSection&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>filter&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>tab</b> - The tab in which this section appears.</li>
+<li><b>id</b> - The unique id for the section.</li>
+<li><b>class</b> - The class that implements the section, i.e. implements <tt>org.eclipse.wst.ui.properties.IPropertySection</tt>.
+Or, the class could extends <code>AttributeGroup</code>, in that case, system will automatically create a <code>AttributeGroupSection</code> for it.</li>
+<li><b>afterSection</b> - When there is more than one section in a tab, sections are sorted by the afterSection attribute.</li>
+<li><b>filter</b> - The class that implements a ISectionFilter</li>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.tagFilter">tagFilter</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST tagFilter</p>
+<p class=code id=dtdAttlist>uri&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>tagName&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>caseSensitive&nbsp;(true | false) "true"&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>uri</b> - </li>
+<li><b>tagName</b> - </li>
+<li><b>caseSensitive</b> - </li>
+</ul>
+<br><br>
+<p class=note id=copyright>
+Copyright 2006 Sybase and others
+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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_tagCreationFactories.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_tagCreationFactories.html
new file mode 100644
index 0000000..c541df4
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_tagCreationFactories.html
@@ -0,0 +1,40 @@
+<!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>tagCreationFactories</title>
+<style>@import url("../../book.css");</style>
+<style>@import url("../../schema.css");</style>
+</HEAD>
+<BODY>
+<H1><CENTER>tagCreationFactories</CENTER></H1>
+<p></p>
+<h6 class=CaptionFigColumn id=header>Identifier: </h6>org.eclipse.jst.pagedesigner.tagCreationFactories<p></p>
+<h6 class=CaptionFigColumn id=header>Since: </h6>2.0
+<p></p>
+
+<p>
+<h6 class=CaptionFigColumn id=header>Description: </h6><p><b>This extension point is provisional and subject to change</b></p></p>
+<p><h6 class=CaptionFigColumn id=header>Configuration Markup:</h6></p>
+<p class=code id=dtd>&lt;!ELEMENT <a name="e.extension">extension</a> (<a href="#e.tagCreatorFactory">tagCreatorFactory</a>)*&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST extension</p>
+<p class=code id=dtdAttlist>point&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>name&nbsp;&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+</ul>
+<br><p class=code id=dtd>&lt;!ELEMENT <a name="e.tagCreatorFactory">tagCreatorFactory</a> EMPTY&gt;</p>
+<p class=code id=dtd>&lt;!ATTLIST tagCreatorFactory</p>
+<p class=code id=dtdAttlist>uri&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>factory&nbsp;CDATA #IMPLIED&gt;</p>
+<p></p>
+<ul class=ConfigMarkup id=attlistDesc>
+<li><b>uri</b> - </li>
+<li><b>factory</b> - </li>
+</ul>
+<br><br>
+<p class=note id=copyright>
+Copyright 2006 Sybase and others
+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></p>
+
+</p>
+</BODY>
+</HTML>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.properties b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.properties
new file mode 100644
index 0000000..4acb561
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.properties
@@ -0,0 +1,92 @@
+eclipse.home=C:/cam/wtpRC3_candidate/eclipse
+
+plugin.basedir=.
+plugin.sourcefolders=../org.eclipse.jst.jsf.common/src;\
+../org.eclipse.jst.jsf.common.ui/src;\
+../org.eclipse.jst.jsf.core/src;\
+../org.eclipse.jst.jsf.facesconfig/facesconfig;\
+../org.eclipse.jst.jsf.facesconfig.ui/src;\
+../org.eclipse.jst.jsf.ui/src;\
+../org.eclipse.jst.pagedesigner/src;\
+../org.eclipse.jst.pagedesigner.jsp.core/src;\
+../org.eclipse.jst.jsf.ui/src;
+
+
+api.packages=org.eclipse.jst.jsf.common.dom,\
+org.eclipse.jst.jsf.common.metadata,\
+org.eclipse.jst.jsf.common.metadata.query,\
+org.eclipse.jst.jsf.common.metadata.traittypes.traittypes,\
+org.eclipse.jst.jsf.common.sets.*,\
+org.eclipse.jst.jsf.common.util,\
+org.eclipse.jst.jsf.contentmodel.annotation,\
+org.eclipse.jst.jsf.context,\
+org.eclipse.jst.jsf.context.resolver,\
+org.eclipse.jst.jsf.context.resolver.structureddocument,\
+org.eclipse.jst.jsf.context.structureddocument,\
+org.eclipse.jst.jsf.context.symbol,\
+org.eclipse.jst.jsf.context.symbol.provider,\
+org.eclipse.jst.jsf.context.symbol.source,\
+org.eclipse.jst.jsf.core,\
+org.eclipse.jst.jsf.core.jsfappconfig,\
+org.eclipse.jst.jsf.core.jsflibraryconfiguration,\
+org.eclipse.jst.jsf.core.jsflibraryregistry,\
+org.eclipse.jst.jsf.core.set.*,\
+org.eclipse.jst.jsf.core.tagmatcher,\
+org.eclipse.jst.jsf.designtime,\
+org.eclipse.jst.jsf.designtime.context,\
+org.eclipse.jst.jsf.designtime.el,\
+org.eclipse.jst.jsf.designtime.resolver,\
+org.eclipse.jst.jsf.designtime.symbols,\
+org.eclipse.jst.jsf.metadataprocessors,\
+org.eclipse.jst.jsf.metadataprocessors.features,\
+org.eclipse.jst.jsf.taglibprocessing.attributevalues,\
+org.eclipse.jst.jsf.facesconfig.edit.provider,\
+org.eclipse.jst.jsf.facesconfig.emf.*,\
+org.eclipse.jst.jsf.facesconfig.emf.util,\
+org.eclipse.jst.pagedesigner,\
+org.eclipse.jst.pagedesigner.converter,\
+org.eclipse.jst.pagedesigner.dtmanager,\
+org.eclipse.jst.pagedesigner.dtmanager.converter,\
+org.eclipse.jst.pagedesigner.dtmanager.converter.operations,\
+org.eclipse.jst.pagedesigner.dtmanager.dtinfo,\
+org.eclipse.jst.pagedesigner.extensionpoint
+ 
+
+api.title=Web Tools Platform: JavaServer Faces Tools
+
+classpath=${eclipse.home}/plugins/org.eclipse.emf.ecore_2.3.0.v200706061821.jar;\
+${eclipse.home}/plugins/org.eclipse.emf.common_2.3.0.v200706061821.jar;\
+${eclipse.home}/plugins/org.eclipse.emf.ecore.xmi_2.3.0.v200706061821.jar;\
+${eclipse.home}/plugins/org.eclipse.emf.edit_2.3.0.v200706061821.jar;\
+${eclipse.home}/plugins/org.eclipse.core.commands_3.3.0.I20070523-1500.jar;\
+${eclipse.home}/plugins/org.eclipse.core.resources_3.3.0.v20070530.jar;\
+${eclipse.home}/plugins/org.eclipse.core.runtime_3.3.100.v20070530.jar;\
+${eclipse.home}/plugins/org.eclipse.equinox.common_3.3.0.v20070426.jar;\
+${eclipse.home}/plugins/org.eclipse.equinox.preferences_3.2.100.v20070522.jar;\
+${eclipse.home}/plugins/org.eclipse.equinox.registry_3.3.0.v20070522.jar;\
+${eclipse.home}/plugins/org.eclipse.jdt.core_3.3.0.v_768.jar;\
+${eclipse.home}/plugins/org.eclipse.jst.j2ee_1.1.103.v200706121630.jar;\
+${eclipse.home}/plugins/org.eclipse.jst.j2ee.core_1.1.102.v200706111630.jar;\
+${eclipse.home}/plugins/org.eclipse.jst.j2ee.web_1.1.103.v200706071630.jar;\
+${eclipse.home}/plugins/org.eclipse.jst.jsp.core_1.2.0.v200706120811.jar;\
+${eclipse.home}/plugins/org.eclipse.jem.util_2.0.0.v200705302225.jar;\
+${eclipse.home}/plugins/org.eclipse.jface_3.3.0.I20070601-1200.jar;\
+${eclipse.home}/plugins/org.eclipse.jface.text_3.3.0.v20070531-1300.jar;\
+${eclipse.home}/plugins/org.eclipse.osgi_3.3.0.v20070530.jar;\
+${eclipse.home}/plugins/org.eclipse.swt_3.3.0.v3345b.jar;\
+${eclipse.home}/plugins/org.eclipse.swt.win32.win32.x86_3.3.0.v3345a.jar;\
+${eclipse.home}/plugins/org.eclipse.text_3.3.0.v20070531-1300.jar;\
+${eclipse.home}/plugins/org.eclipse.ui.ide_3.3.0.I20070531-1800.jar;\
+${eclipse.home}/plugins/org.eclipse.ui.presentations.r21_3.1.0.jar;\
+${eclipse.home}/plugins/org.eclipse.ui.workbench_3.3.0.I20070601-0010.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.common.emf_1.1.103.v200706071630.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.common.frameworks_1.1.102.v200706071630.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.common.modulecore_1.1.102.v200706071630.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.common.project.facet.core_1.2.0.v200706071740.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.html.core_1.1.101.v200706120811.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.sse.core_1.1.201.v200705302225.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.sse.ui_1.0.302.v200706042202.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.validation_1.1.101.v200706071630.jar;\
+${eclipse.home}/plugins/org.eclipse.wst.xml.core_1.1.200.v200706120811.jar;\
+${eclipse.home}/plugins/javax.servlet.jsp_2.0.0.v200706111738.jar;\
+${eclipse.home}/plugins/org.apache.commons.el_1.0.0.v200706111724.jar
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xml b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xml
new file mode 100644
index 0000000..3ab681f
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--overview="${basedir}/html/api_reference/erview/overview.html"-->
+<project default="main" basedir=".">
+
+	<property file="javadoc.properties" />
+	<property name="outputDir" value="${basedir}"/>
+	<property name="eclipse.home" value="${basedir}/.."/>
+	
+	<target name="main" depends="prephtml, javadoc, packagetoc" description="Builds Plugin Javadoc" />
+
+	<target name="prephtml" description="Transforms XML to HTML.">	
+		<xslt 	style="javadoc.xsl" 
+				destdir=".." 
+				basedir=".."	
+				includes="**/overview.xml,**/package.xml" 
+				excludes="**/build/*,**/@dot/**"
+		/>  
+	</target>
+
+    <target name="javadoc">
+<echo message="========= ${eclipse.home}"/>
+<echo message="========= ${classpath}"/>
+    	<mkdir dir="${outputDir}/api-overview/overview" />
+
+		<copy todir="${outputDir}/api-overview/overview" flatten="true" >
+			<fileset dir="${basedir}/api-overview/overview/"/> 
+			<fileset dir="${basedir}/.." includes="*/javadoc-images/*.jpg"/> 
+		</copy>
+        <javadoc
+        	access="public" 
+    		additionalparam="-breakiterator -tag model:X -tag generated:X -tag ordered:X"
+			author="false" 
+			classpath="${classpath}" 
+			destdir="${outputDir}/html/api_reference" 
+			doctitle="${api.title}" 
+			nodeprecated="false" 
+			nodeprecatedlist="false" 
+			noindex="false" 
+			nonavbar="false" 
+			notree="false" 
+        	overview="${basedir}/api-overview/overview.html"
+			packagenames="${api.packages}" 
+			sourcepath="${plugin.sourcefolders}" 
+			splitindex="true" 
+			use="true" 
+			version="true"
+			breakiterator="yes"
+        	verbose="false"
+        	failonerror="true"
+			>
+				<tag name="ignore"     description="ignore" enabled="false"/>
+				<tag name="generated"  description="ignore" enabled="false"/>
+				<tag name="model"      description="ignore" enabled="false"/>
+				<tag name="modifiable" description="ignore" enabled="false"/>
+				<tag name="extends"    description="ignore" enabled="false"/>
+				<tag name="implements" description="ignore" enabled="false"/>
+				<tag name="ordered"    description="ignore" enabled="false"/>
+        	</javadoc>
+    </target> 
+	
+	<target name="packagetoc">
+			<loadfile
+				  failonerror="false"
+			      property="wtp.packages"
+			      srcFile="${outputDir}/html/api_reference/package-list">
+				  <filterchain>
+				  	<filterreader classname="org.apache.tools.ant.filters.PrefixLines">
+				  	  <param name="prefix" value="&lt;/package&gt;&lt;package&gt;"/>
+				  	</filterreader>
+				  	<striplinebreaks/>
+				 </filterchain>
+			</loadfile>
+			
+			<!-- Create packages.xml file -->
+			<echo file="packages.xml">&lt;packages&gt;&lt;package&gt;${wtp.packages}&lt;/package&gt;&lt;/packages&gt;</echo>
+			
+			<xslt basedir="${basedir}" in="packages.xml" out="javadoctoc.xml" style="javadocToc.xsl">
+				<outputproperty name="method" value="xml"/>
+				<outputproperty name="indent" value="yes"/>
+			</xslt>
+		</target>
+</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xsl b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xsl
new file mode 100644
index 0000000..5b824e5
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xsl
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	version="1.0">
+
+	<xsl:variable name="root">
+		<xsl:choose>
+			<xsl:when test="/html/head/meta[@name='root']/@content">
+				<xsl:value-of select="/html/head/meta[@name='root']/@content" />
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:text>../..</xsl:text>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:variable>
+
+	<xsl:template match="/">
+		<xsl:apply-templates />
+	</xsl:template>
+
+	<xsl:template match="html">
+		<html>
+			<head>
+				<meta
+					content="text/html; charset=iso-8859-1"
+					http-equiv="Content-Type" />
+				<link
+					type="text/css"
+					href="{$root}/apistyles.css"
+					rel="stylesheet" />
+				<xsl:apply-templates select="head/title" />
+			</head>
+			<body> 
+				<xsl:apply-templates
+					select="body/*"
+					mode="body" />
+			</body>
+		</html>
+	</xsl:template>
+
+	<xsl:template
+		match="h1"
+		mode="banner">
+		<table
+			border="0"
+			cellpadding="2"
+			cellspacing="5"
+			width="100%">
+			<tbody>
+				<tr>
+					<td
+						align="left"
+						width="60%">
+						<font class="indextop">
+							<xsl:value-of select="." />
+						</font>
+						<br />
+						<font class="indexsub">
+							<xsl:value-of select="/html/head/title" />
+						</font>
+					</td>
+					<td width="40%">
+						<img
+							src="{$root}/overview/Idea.jpg"
+							align="middle"
+							height="86"
+							hspace="50"
+							width="120" />
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</xsl:template>
+
+	<xsl:template
+		match="h1"
+		mode="body" />
+
+	<xsl:template
+		match="h2"
+		mode="body">
+
+		<table
+			border="0"
+			cellpadding="2"
+			cellspacing="5"
+			width="100%">
+			<tbody>
+				<tr>
+					<td
+						colspan="2"
+						align="left"
+						bgcolor="#0080c0"
+						valign="top">
+						<b>
+							<font
+								color="#ffffff"
+								face="Arial,Helvetica">
+								<xsl:apply-templates />
+							</font>
+						</b>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</xsl:template>
+
+	<xsl:template
+		match="h3"
+		mode="body">
+		<img
+			src="{$root}/images/Adarrow.gif"
+			border="0"
+			height="16"
+			width="16" />
+		<xsl:apply-templates />
+	</xsl:template>
+
+	<xsl:template
+		match="*"
+		mode="body">
+
+		<xsl:copy>
+			<xsl:apply-templates select="*|@*|text()" />
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*|@*|text()">
+		<xsl:copy>
+			<xsl:apply-templates select="*|@*|text()" />
+		</xsl:copy>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadocToc.xsl b/plugins/org.eclipse.jst.jsf.doc.dev/javadocToc.xsl
new file mode 100644
index 0000000..999c73e
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadocToc.xsl
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    version="1.0"
+    xmlns:xalan="http://xml.apache.org/xslt"
+    exclude-result-prefixes="xalan">
+    
+     <xsl:template match="packages">
+     <xsl:text disable-output-escaping="yes">
+&lt;?NLS TYPE="org.eclipse.help.toc"?&gt;
+	 </xsl:text>
+	 <toc label="Javadoc Packages Reference">
+	 <xsl:for-each select="package">
+	 <xsl:sort select="text()"/>
+	 	<xsl:if test="text() != ''">
+	 		<topic label="{text()}" href="html/api_reference/{translate(text(),'.','/')}/package-summary.html"/>
+	 	</xsl:if>
+	 </xsl:for-each>
+	
+	 </toc> 
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml b/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
new file mode 100644
index 0000000..7d35ed8
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
@@ -0,0 +1 @@
+<files component="jsf"><file>org_eclipse_jst_jsf_common_annotationFiles.html</file><file>org_eclipse_jst_jsf_common_contextSymbolFactory.html</file><file>org_eclipse_jst_jsf_common_domainLoadingStrategies.html</file><file>org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html</file><file>org_eclipse_jst_jsf_common_domainSourceModelTypes.html</file><file>org_eclipse_jst_jsf_common_standardMetaDataFiles.html</file><file>org_eclipse_jst_jsf_common_symbolSourceProvider.html</file><file>org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html</file><file>org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html</file><file>org_eclipse_jst_jsf_core_externalcontext.html</file><file>org_eclipse_jst_jsf_core_jsfLibraries.html</file><file>org_eclipse_jst_jsf_core_methodresolver.html</file><file>org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html</file><file>org_eclipse_jst_jsf_core_propertyresolver.html</file><file>org_eclipse_jst_jsf_core_variableresolver.html</file><file>org_eclipse_jst_pagedesigner_cmRegistry.html</file><file>org_eclipse_jst_pagedesigner_pageDesignerExtension.html</file><file>org_eclipse_jst_pagedesigner_popupMenuContributor.html</file><file>org_eclipse_jst_pagedesigner_propertyContributor.html</file><file>org_eclipse_jst_pagedesigner_propertySections.html</file><file>org_eclipse_jst_pagedesigner_tagCreationFactories.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
new file mode 100644
index 0000000..479dd87
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml
@@ -0,0 +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.contentmodel.annotation</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</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</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.extensionpoint</package></packages>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml b/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml
index aa2cbc1..72ce7e7 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml
@@ -6,16 +6,26 @@
 		<link toc="javadoctoc.xml" />
 	</topic>
 	<topic label="Extension Points Reference" href="html/extpts_reference/index.html">
-		<topic label="org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_contentmodel_annotations_annotationFiles.html"/>
-		<topic label="org.eclipse.jst.jsf.context.symbol.contextSymbolFactory" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_contextSymbolFactory.html"/>
-		<topic label="org.eclipse.jst.jsf.context.symbol.symbolSourceProvider" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_context_symbol_symbolSourceProvider.html"/>
+		<topic label="org.eclipse.jst.jsf.common.annotationFiles" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_annotationFiles.html"/>
+		<topic label="org.eclipse.jst.jsf.common.contextSymbolFactory" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_contextSymbolFactory.html"/>
+		<topic label="org.eclipse.jst.jsf.common.domainLoadingStrategies" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html"/>
+		<topic label="org.eclipse.jst.jsf.common.domainSourceModelTypes" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypes.html"/>
+		<topic label="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html"/>
+		<topic label="org.eclipse.jst.jsf.common.standardMetaDataFiles" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html"/>
+		<topic label="org.eclipse.jst.jsf.common.symbolSourceProvider" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_symbolSourceProvider.html"/>
+		<topic label="org.eclipse.jst.jsf.core.AttributeValueRuntimeTypes" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html"/>
+		<topic label="org.eclipse.jst.jsf.core.externalcontext" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_externalcontext.html"/>
 		<topic label="org.eclipse.jst.jsf.core.jsfLibraries" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html"/>
-		<topic label="org.eclipse.jst.jsf.designtime.externalcontext" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_externalcontext.html"/>
-		<topic label="org.eclipse.jst.jsf.designtime.methodresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_methodresolver.html"/>
-		<topic label="org.eclipse.jst.jsf.designtime.propertyresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_propertyresolver.html"/>
-		<topic label="org.eclipse.jst.jsf.designtime.variableresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_designtime_variableresolver.html"/>
-		<topic label="org.eclipse.jst.jsf.facesconfig.common.introductionPage" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_introductionPage.html"/>
-		<topic label="org.eclipse.jst.jsf.facesconfig.common.overviewPage" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_facesconfig_common_overviewPage.html"/>
-		<topic label="org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledFeatures" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_metadataprocessors_MetaDataEnabledFeatures.html"/>
+		<topic label="org.eclipse.jst.jsf.core.MetaDataEnabledFeatures" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html"/>
+		<topic label="org.eclipse.jst.jsf.core.methodresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_methodresolver.html"/>
+		<topic label="org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html"/>
+		<topic label="org.eclipse.jst.jsf.core.propertyresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_propertyresolver.html"/>
+		<topic label="org.eclipse.jst.jsf.core.variableresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_variableresolver.html"/>
+		<topic label="org.eclipse.jst.pagedesigner.cmRegistry" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_cmRegistry.html"/>
+		<topic label="org.eclipse.jst.pagedesigner.pageDesignerExtension" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html"/>
+		<topic label="org.eclipse.jst.pagedesigner.popupMenuContributor" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_popupMenuContributor.html"/>
+		<topic label="org.eclipse.jst.pagedesigner.propertyContributor" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertyContributor.html"/>
+		<topic label="org.eclipse.jst.pagedesigner.propertySections" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertySections.html"/>
+		<topic label="org.eclipse.jst.pagedesigner.tagCreationFactories" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_tagCreationFactories.html"/>
 	</topic>
 </toc>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/topics_ExtPoint_Reference.xml b/plugins/org.eclipse.jst.jsf.doc.dev/topics_ExtPoint_Reference.xml
new file mode 100644
index 0000000..54b5060
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/topics_ExtPoint_Reference.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?NLS TYPE="org.eclipse.help.toc"?>
+	 	<toc label="Extension Points Reference">
+<topic label="org.eclipse.jst.jsf.common.annotationFiles" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_annotationFiles.html"/>
+<topic label="org.eclipse.jst.jsf.common.contextSymbolFactory" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_contextSymbolFactory.html"/>
+<topic label="org.eclipse.jst.jsf.common.domainLoadingStrategies" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html"/>
+<topic label="org.eclipse.jst.jsf.common.domainSourceModelTypes" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypes.html"/>
+<topic label="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html"/>
+<topic label="org.eclipse.jst.jsf.common.standardMetaDataFiles" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html"/>
+<topic label="org.eclipse.jst.jsf.common.symbolSourceProvider" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_common_symbolSourceProvider.html"/>
+<topic label="org.eclipse.jst.jsf.core.AttributeValueRuntimeTypes" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html"/>
+<topic label="org.eclipse.jst.jsf.core.externalcontext" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_externalcontext.html"/>
+<topic label="org.eclipse.jst.jsf.core.jsfLibraries" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html"/>
+<topic label="org.eclipse.jst.jsf.core.MetaDataEnabledFeatures" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html"/>
+<topic label="org.eclipse.jst.jsf.core.methodresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_methodresolver.html"/>
+<topic label="org.eclipse.jst.jsf.core.pluginProvidedJsfLibraries" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html"/>
+<topic label="org.eclipse.jst.jsf.core.propertyresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_propertyresolver.html"/>
+<topic label="org.eclipse.jst.jsf.core.variableresolver" href="html/extpts_reference/jsf/org_eclipse_jst_jsf_core_variableresolver.html"/>
+<topic label="org.eclipse.jst.pagedesigner.cmRegistry" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_cmRegistry.html"/>
+<topic label="org.eclipse.jst.pagedesigner.pageDesignerExtension" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_pageDesignerExtension.html"/>
+<topic label="org.eclipse.jst.pagedesigner.popupMenuContributor" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_popupMenuContributor.html"/>
+<topic label="org.eclipse.jst.pagedesigner.propertyContributor" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertyContributor.html"/>
+<topic label="org.eclipse.jst.pagedesigner.propertySections" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_propertySections.html"/>
+<topic label="org.eclipse.jst.pagedesigner.tagCreationFactories" href="html/extpts_reference/jsf/org_eclipse_jst_pagedesigner_tagCreationFactories.html"/>
+</toc>