Update javadoc + ext-pt doc build
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jsf.doc.dev/META-INF/MANIFEST.MF
index 1e01b2a..5ea479f 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/META-INF/MANIFEST.MF
@@ -5,4 +5,5 @@
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
+Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.osgi;bundle-version="[3.4.0,4.0.0)"
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/README.TXT b/plugins/org.eclipse.jst.jsf.doc.dev/README.TXT
new file mode 100644
index 0000000..02a6cde
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/README.TXT
@@ -0,0 +1,59 @@
+----------------------------------------------------------------------------------
+--						Generating JavaDoc and Ext-Pt Docs for 					--
+--						org.eclipse.jst.jsf.doc.dev plugin						--
+--								04/28/08	(GK)								--
+----------------------------------------------------------------------------------
+
+Intro:
+	This task could be automated as part of the build, but is not currently.  Before
+	each release, the build scripts should be executed and resulting documentation 
+	should be checked in.
+	
+	
+JavaDoc Generation Task
+	Intro:
+		The javadocBuild.xml file is used to create all the javadocs.   It uses the
+		wtp.jsf.map file to locate all of our non-test plugins, and then calls a custom
+		Ant task to gather all of the non-internal, non-x-friend exported packages from 
+		each of the plugins.  The discovered source and API packages are fed to the 
+		Javadoc Ant task.
+		
+		** The packages should be verified as being API.  The MANIFEST.MF is the single 
+		source of truth.
+		
+	
+	Setup:
+		- ensure all JSF/Pagedesigner plugins (Test plugins not required) are present in workspace
+		- ensure releng.jsf project is also present
+		- ensure ant-contrib-0.6.jar (or equivalent) and parseAPIPackages.jar is in lib directory
+		- if there are API packages to be excluded from the javadoc (deprecated API), 
+		set in javadocBuild.properties as comma delimited list in api.exceptions
+		
+	Generate:
+		1) select javadocBuild.xml file in project explorer
+		2) Run as "Ant Build..." --> JRE Tab, ensure that "Run in same JRE as Workspace" is 
+		selected
+		3) check apiPackages.txt for accuracy
+	
+Extension-point References Task
+	Intro:
+		The listed-ext-points property in buildExtDocs.properties file is used to generate 
+		the HTML documentation from the schemas.   This list must be verified for accuracy 
+		and is not generated like the Javadoc API packages are.
+		
+	Setup:
+		- same as for Javadoc above
+		
+	Generate:
+		1) select buildExtDocs.xml file in project explorer
+		2) Run as "Ant Build..." --> JRE Tab, ensure that "Run in same JRE as Workspace" is 
+		selected
+
+Checking-in:
+	Checkin:
+	- any changes made in the HTML directory
+	- javadoctoc.xml
+	- tocreference.xml
+	- topics_ExtPoint_Reference.xml
+
+		
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/apiPackages.txt b/plugins/org.eclipse.jst.jsf.doc.dev/apiPackages.txt
new file mode 100644
index 0000000..99fa885
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/apiPackages.txt
@@ -0,0 +1,42 @@
+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.constraint,
+org.eclipse.jst.jsf.core.set.mapping,
+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.impl,
+org.eclipse.jst.jsf.facesconfig.emf.util,
+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.sets.constraint,
+org.eclipse.jst.jsf.common.sets.mapping,
+org.eclipse.jst.jsf.common.util,
+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.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.editors.properties,
+org.eclipse.jst.pagedesigner.editors.properties.quickedittabsections,
+org.eclipse.jst.pagedesigner.extensionpoint,
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/book.css b/plugins/org.eclipse.jst.jsf.doc.dev/book.css
index d7e2b57..1ecf145 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/book.css
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/book.css
@@ -1,22 +1,112 @@
-@import "../PRODUCT_PLUGIN/book.css";
-
-span.control {
-  font-weight: bold;
+P.Code {
+	display: block;
+	text-align: left;
+	text-indent: 0.00pt;
+	margin-top: 0.000000pt;
+	margin-bottom: 0.000000pt;
+	margin-right: 0.000000pt;
+	margin-left: 15pt;
+	font-size: 10.000000pt;
+	font-weight: normal;
+	font-style: normal;
+	color: #4444CC;
+	text-decoration: none;
+	vertical-align: baseline;
+	text-transform: none;
+	font-family: "Courier New", Courier, monospace;
 }
-
-span.name {
-  font-style: italic;
-}
-
-span.code {
-  font-family: monospace;
-}
-
-p.nav_footer {
+H6.CaptionFigColumn {
+	display: block;
+	text-align: left;
+	text-indent: 0.000000pt;
+	margin-top: 3.000000pt;
+	margin-bottom: 11.000000pt;
+	margin-right: 0.000000pt;
+	margin-left: 0.000000pt;
+	font-size: 9.000000pt;
 	font-weight: bold;
+	font-style: Italic;
+	color: #000000;
+	text-decoration: none;
+	vertical-align: baseline;
+	text-transform: none;
+}
+P.Note {
+	display: block;
+	text-align: left;
+	text-indent: 0pt;
+	margin-top: 19.500000pt;
+	margin-bottom: 19.500000pt;
+	margin-right: 0.000000pt;
+	margin-left: 30pt;
+	font-size: 11.000000pt;
+	font-weight: normal;
+	font-style: Italic;
+	color: #000000;
+	text-decoration: none;
+	vertical-align: baseline;
+	text-transform: none;
+}
+EM.UILabel {
+	font-weight: Bold;
+	font-style: normal;
+	text-decoration: none;
+	vertical-align: baseline;
+	text-transform: none;
+}
+EM.CodeName {
+	font-weight: Bold;
+	font-style: normal;
+	text-decoration: none;
+	vertical-align: baseline;
+	text-transform: none;
+	font-family: "Courier New", Courier, monospace;
 }
 
-p.nav_footer a {
-	font-weight: bold;
-	font-style: italic;
+body, html { border: 0px }
+
+
+/* following font face declarations need to be removed for DBCS */
+
+body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000}
+pre				{ font-family: "Courier New", Courier, monospace;}
+
+/* end font face declarations */
+
+/* following font size declarations should be OK for DBCS */
+body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
+pre				{ font-size: 10pt}
+
+/* end font size declarations */
+
+body	     { background: #FFFFFF; margin-bottom: 1em }
+h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
+h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
+h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
+h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
+p            { margin-top: 10px; margin-bottom: 10px }
+pre          { margin-left: 6; font-size: 9pt; color: #4444CC } 
+a:link	     { color: #0000FF }
+a:hover	     { color: #000080 }
+a:visited    { text-decoration: underline }
+ul	     { margin-top: 10px; margin-bottom: 10px; }
+li	     { margin-top: 5px; margin-bottom: 5px; } 
+li p	     { margin-top: 5px; margin-bottom: 5px; }
+ol	     { margin-top: 10px; margin-bottom: 10px; }
+dl	     { margin-top: 10px; margin-bottom: 10px; }
+dt	     { margin-top: 5px; margin-bottom: 5px; font-weight: bold; }
+dd	     { margin-top: 5px; margin-bottom: 5px; }
+strong	     { font-weight: bold}
+em	     { font-style: italic}
+var	     { font-style: italic}
+div.revision { border-left-style: solid; border-left-width: thin; 
+				   border-left-color: #7B68EE; padding-left:5 }
+th	     { font-weight: bold }
+
+a.command-link {
 }
+a.command-link img {
+	border-width: 0px;
+	border-style: none;
+	vertical-align: middle;
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/build.properties b/plugins/org.eclipse.jst.jsf.doc.dev/build.properties
index 3336ab2..3041c27 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/build.properties
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/build.properties
@@ -10,7 +10,7 @@
 ###############################################################################
 bin.includes = META-INF/,\
                plugin.xml,\
-               book.css,\
+               bookOLD.css,\
                html/,\
                plugin.properties,\
                toc.xml,\
@@ -19,6 +19,4 @@
                toctutorials.xml,\
                about.html,\
                topics_ExtPoint_Reference.xml,\
-               packages.xml,\
-               jsfextdocs.xml,\
                javadoctoc.xml
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
index 47e5ad8..2fccdf0 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.properties
@@ -2,15 +2,15 @@
 # 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,\
+
+listed-ext-points=org.eclipse.jst.jsf.common.contextSymbolFactory,\
 	org.eclipse.jst.jsf.common.domainLoadingStrategies,\
 	org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators,\
 	org.eclipse.jst.jsf.common.domainSourceModelTypes,\
@@ -24,9 +24,6 @@
 	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
+	org.eclipse.jst.pagedesigner.propertyContributor
\ 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
index 8e69fc9..a9312ba 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/buildExtDocs.xml
@@ -5,13 +5,21 @@
 	<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"/>
+	<!-- <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">
+ 		<!-- cleanup old -->
+ 		<delete>
+ 	 		<fileset dir="${jsfOutputDir}" casesensitive="yes" id="ext-docs-list-ent">
+ 	 			<include name="*.html"/>
+ 			</fileset>
+ 		</delete>
+ 		
+ 		<!-- generate new html from ext-pt schemas -->
  		<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}" />
@@ -19,10 +27,10 @@
  		<!-- Get the list of extension doc files. -->
  		<fileset dir="${jsfOutputDir}" casesensitive="yes" id="ext-docs-list-ent">
  			<include name="*.html"/>
- 		</fileset>
- 		 						
+		</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;">
+ 		<pathconvert property="ext-doc-ent" refid="ext-docs-list-ent" pathsep="&lt;/file&gt;/n/n&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>
@@ -30,6 +38,7 @@
  	</target>
 	
 	<target name="createDocListings">
+		<delete file="${outputDir}${file.separator}index.html"/>
 		<!-- Create the overview document. -->
 		<xslt basedir="${basedir}" in="extDocListings.xml" out="${outputDir}${file.separator}index.html" style="extDocOverview.xsl">
 	  		<param name="title" expression="${title}"/>
@@ -46,5 +55,4 @@
 		</xslt>
 			
 	</target>
-
 </project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/extDocOverview.xsl b/plugins/org.eclipse.jst.jsf.doc.dev/extDocOverview.xsl
index ffe0ef1..2ad1987 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/extDocOverview.xsl
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/extDocOverview.xsl
@@ -15,7 +15,7 @@
 		<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 name="copyright" content="Copyright (c) Oracle Corporation and others 2000, 2008. 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>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.properties b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.properties
index 4acb561..707f3b9 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.properties
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.properties
@@ -1,92 +1,10 @@
-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
+api.exceptions=org.eclipse.jst.jsf.contentmodel.annotation,\
+org.eclipse.jst.jsf.facesconfig,\
+org.eclipse.jst.jsf.facesconfig.util,\
+org.eclipse.jst.jsf.validation.internal.strategy
+
+
+
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xml b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xml
index 3ab681f..97af1e7 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadoc.xml
@@ -6,8 +6,16 @@
 	<property name="outputDir" value="${basedir}"/>
 	<property name="eclipse.home" value="${basedir}/.."/>
 	
-	<target name="main" depends="prephtml, javadoc, packagetoc" description="Builds Plugin Javadoc" />
+	<target name="main" depends="clean, prephtml, javadoc, packagetoc" description="Builds Plugin Javadoc" />
 
+	<target name="clean">
+		<delete>
+			<fileset dir="${outputDir}/html/api_reference/" >
+				<include name="**/*.html"/>
+			</fileset>
+		</delete>
+	</target>
+	
 	<target name="prephtml" description="Transforms XML to HTML.">	
 		<xslt 	style="javadoc.xsl" 
 				destdir=".." 
@@ -18,15 +26,14 @@
 	</target>
 
     <target name="javadoc">
-<echo message="========= ${eclipse.home}"/>
-<echo message="========= ${classpath}"/>
+	    <echo message="========= ${eclipse.home}"/>
     	<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
+        <javadoc 
         	access="public" 
     		additionalparam="-breakiterator -tag model:X -tag generated:X -tag ordered:X"
 			author="false" 
@@ -46,7 +53,7 @@
 			version="true"
 			breakiterator="yes"
         	verbose="false"
-        	failonerror="true"
+        	failonerror="false"
 			>
 				<tag name="ignore"     description="ignore" enabled="false"/>
 				<tag name="generated"  description="ignore" enabled="false"/>
@@ -58,10 +65,10 @@
         	</javadoc>
     </target> 
 	
-	<target name="packagetoc">
+	<target name="packagetoc">			
 			<loadfile
 				  failonerror="false"
-			      property="wtp.packages"
+			      property="jsf.packages"
 			      srcFile="${outputDir}/html/api_reference/package-list">
 				  <filterchain>
 				  	<filterreader classname="org.apache.tools.ant.filters.PrefixLines">
@@ -72,9 +79,9 @@
 			</loadfile>
 			
 			<!-- Create packages.xml file -->
-			<echo file="packages.xml">&lt;packages&gt;&lt;package&gt;${wtp.packages}&lt;/package&gt;&lt;/packages&gt;</echo>
+			<echo file="packages.xml">&lt;packages&gt;&lt;package&gt;${jsf.packages}&lt;/package&gt;&lt;/packages&gt;</echo>
 			
-			<xslt basedir="${basedir}" in="packages.xml" out="javadoctoc.xml" style="javadocToc.xsl">
+			<xslt basedir="${outputdir}" in="packages.xml" out="javadoctoc.xml" style="javadocToc.xsl">
 				<outputproperty name="method" value="xml"/>
 				<outputproperty name="indent" value="yes"/>
 			</xslt>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/javadocBuild.xml b/plugins/org.eclipse.jst.jsf.doc.dev/javadocBuild.xml
new file mode 100644
index 0000000..e3b6ef9
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadocBuild.xml
@@ -0,0 +1,170 @@
+<?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}/.."/>
+	<property name="apiPackages" value="${basedir}/apiPackages.txt" />
+	<property name="srcFolders" value="${basedir}/srcFolders.txt" />
+	
+	<target name="main" depends="clean, pluginAPI, pluginSourceFolders, prephtml, javadoc, packagetoc" description="Builds Plugin Javadoc" />
+	<taskdef resource="net/sf/antcontrib/antcontrib.properties"> 
+	  <classpath>
+	    <pathelement location="${basedir}/lib/ant-contrib-0.6.jar" />
+	  </classpath>
+	</taskdef>
+
+	<taskdef name="doco.parseAPIPackages" classname="org.eclipse.jst.jsf.genapi.util.ParseAPIPackages"> 
+	  <classpath>
+	    <pathelement location="${basedir}/lib/parseAPIPackages.jar" />
+	  </classpath>
+	</taskdef>
+
+	<taskdef name="doco.parseSourceFolders" classname="org.eclipse.jst.jsf.genapi.util.ParseBundleSourceFolders"> 
+	  <classpath>
+	    <pathelement location="${basedir}/lib/parseAPIPackages.jar" />
+	  </classpath>
+	</taskdef>
+	
+	<target name="pluginSources">
+		<!-- find all plugins -->
+		<loadfile
+			failonerror="true"		      
+		    srcFile="${basedir}/../releng.jsf/maps/wtp.jsf.map" 
+			property="plugin.sources" >
+			<filterchain>
+				<tokenfilter>
+					<containsstring contains="plugin@"/>
+				</tokenfilter>
+				<replacestring from="plugin@" to="" />
+				<replaceregex pattern="=.*" replace=";"/>		
+			</filterchain>
+		</loadfile>
+		<echo file="plugins.xml" message="${plugin.sources}"/>
+	</target>
+	
+	<target name="pluginSourceFolders" depends="pluginSources">
+		<!-- find all API packages from MANIFESTS in plugins -->
+		<for param="plugin" list="${plugin.sources}" delimiter=";" trim="true">
+			<sequential>	
+					<doco.parseSourceFolders
+						bundleid="@{plugin}"
+						filename="${srcFolders}" 
+						delimiter=";" />
+			</sequential>
+		</for>		
+		<echo message="--- source folders ---" />
+		<loadfile
+			failonerror="true"		      
+		    srcFile="${srcFolders}" 
+			property="plugin.sourceFolders" >
+			<filterchain>
+				<prefixlines prefix=".."/>
+			</filterchain>
+		</loadfile>
+		<echo message="${plugin.sourceFolders}" />
+	</target>
+	
+	<target name="pluginAPI" depends="pluginSources">
+		<!-- find all API packages from MANIFESTS in plugins -->
+		<for param="plugin" list="${plugin.sources}" delimiter=";" trim="true">
+			<sequential>	
+					<doco.parseAPIPackages 
+						filename="${apiPackages}" 
+						bundleid="@{plugin}" 
+						exceptionlist="${api.exceptions}"/>		
+				
+			</sequential>
+		</for>
+		<echo message="--- API packages ---" />
+		<loadfile
+			failonerror="true"		      
+		    srcFile="${apiPackages}" 
+			property="api.packages" >
+		</loadfile>
+		<echo message="${api.packages}" />
+		
+	</target>
+	
+	<target name="clean">
+		<delete file="${apiPackages}" />
+		<delete file="${srcFolders}" />
+		<delete>
+			<fileset dir="${outputDir}/html/api_reference/" >
+				<include name="**/*.html"/>
+			</fileset>
+		</delete>
+	</target>
+
+	<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}"/>
+		<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="false"
+			>
+			<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="jsf.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;${jsf.packages}&lt;/package&gt;&lt;/packages&gt;</echo>
+
+		<xslt basedir="${outputdir}" 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/javadoctoc.xml b/plugins/org.eclipse.jst.jsf.doc.dev/javadoctoc.xml
index be0707c..dc4b240 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/javadoctoc.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/javadoctoc.xml
@@ -10,7 +10,6 @@
 <topic label="org.eclipse.jst.jsf.common.sets.constraint" href="html/api_reference/org/eclipse/jst/jsf/common/sets/constraint/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.common.sets.mapping" href="html/api_reference/org/eclipse/jst/jsf/common/sets/mapping/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.common.util" href="html/api_reference/org/eclipse/jst/jsf/common/util/package-summary.html"/>
-<topic label="org.eclipse.jst.jsf.contentmodel.annotation" href="html/api_reference/org/eclipse/jst/jsf/contentmodel/annotation/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.context" href="html/api_reference/org/eclipse/jst/jsf/context/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.context.resolver" href="html/api_reference/org/eclipse/jst/jsf/context/resolver/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.context.resolver.structureddocument" href="html/api_reference/org/eclipse/jst/jsf/context/resolver/structureddocument/package-summary.html"/>
@@ -22,7 +21,6 @@
 <topic label="org.eclipse.jst.jsf.core.jsfappconfig" href="html/api_reference/org/eclipse/jst/jsf/core/jsfappconfig/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.core.jsflibraryconfiguration" href="html/api_reference/org/eclipse/jst/jsf/core/jsflibraryconfiguration/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.core.jsflibraryregistry" href="html/api_reference/org/eclipse/jst/jsf/core/jsflibraryregistry/package-summary.html"/>
-<topic label="org.eclipse.jst.jsf.core.set" href="html/api_reference/org/eclipse/jst/jsf/core/set/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.core.set.constraint" href="html/api_reference/org/eclipse/jst/jsf/core/set/constraint/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.core.set.mapping" href="html/api_reference/org/eclipse/jst/jsf/core/set/mapping/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.core.tagmatcher" href="html/api_reference/org/eclipse/jst/jsf/core/tagmatcher/package-summary.html"/>
@@ -38,11 +36,12 @@
 <topic label="org.eclipse.jst.jsf.metadataprocessors" href="html/api_reference/org/eclipse/jst/jsf/metadataprocessors/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.metadataprocessors.features" href="html/api_reference/org/eclipse/jst/jsf/metadataprocessors/features/package-summary.html"/>
 <topic label="org.eclipse.jst.jsf.taglibprocessing.attributevalues" href="html/api_reference/org/eclipse/jst/jsf/taglibprocessing/attributevalues/package-summary.html"/>
-<topic label="org.eclipse.jst.pagedesigner" href="html/api_reference/org/eclipse/jst/pagedesigner/package-summary.html"/>
 <topic label="org.eclipse.jst.pagedesigner.converter" href="html/api_reference/org/eclipse/jst/pagedesigner/converter/package-summary.html"/>
 <topic label="org.eclipse.jst.pagedesigner.dtmanager" href="html/api_reference/org/eclipse/jst/pagedesigner/dtmanager/package-summary.html"/>
 <topic label="org.eclipse.jst.pagedesigner.dtmanager.converter" href="html/api_reference/org/eclipse/jst/pagedesigner/dtmanager/converter/package-summary.html"/>
 <topic label="org.eclipse.jst.pagedesigner.dtmanager.converter.operations" href="html/api_reference/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/package-summary.html"/>
 <topic label="org.eclipse.jst.pagedesigner.dtmanager.dtinfo" href="html/api_reference/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/package-summary.html"/>
+<topic label="org.eclipse.jst.pagedesigner.editors.properties" href="html/api_reference/org/eclipse/jst/pagedesigner/editors/properties/package-summary.html"/>
+<topic label="org.eclipse.jst.pagedesigner.editors.properties.quickedittabsections" href="html/api_reference/org/eclipse/jst/pagedesigner/editors/properties/quickedittabsections/package-summary.html"/>
 <topic label="org.eclipse.jst.pagedesigner.extensionpoint" href="html/api_reference/org/eclipse/jst/pagedesigner/extensionpoint/package-summary.html"/>
 </toc>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml b/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
index 7d35ed8..dbdf18c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/jsfextdocs.xml
@@ -1 +1 @@
-<files component="jsf"><file>org_eclipse_jst_jsf_common_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
+<files component="jsf"><file>org_eclipse_jst_jsf_common_annotationFiles.html</file>/n/n<file>org_eclipse_jst_jsf_common_contextSymbolFactory.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainLoadingStrategies.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html</file>/n/n<file>org_eclipse_jst_jsf_common_domainSourceModelTypes.html</file>/n/n<file>org_eclipse_jst_jsf_common_standardMetaDataFiles.html</file>/n/n<file>org_eclipse_jst_jsf_common_symbolSourceProvider.html</file>/n/n<file>org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html</file>/n/n<file>org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html</file>/n/n<file>org_eclipse_jst_jsf_core_externalcontext.html</file>/n/n<file>org_eclipse_jst_jsf_core_jsfLibraries.html</file>/n/n<file>org_eclipse_jst_jsf_core_methodresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html</file>/n/n<file>org_eclipse_jst_jsf_core_propertyresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_tagregistry.html</file>/n/n<file>org_eclipse_jst_jsf_core_variableresolver.html</file>/n/n<file>org_eclipse_jst_jsf_core_viewhandler.html</file>/n/n<file>org_eclipse_jst_pagedesigner_cmRegistry.html</file>/n/n<file>org_eclipse_jst_pagedesigner_pageDesignerExtension.html</file>/n/n<file>org_eclipse_jst_pagedesigner_popupMenuContributor.html</file>/n/n<file>org_eclipse_jst_pagedesigner_propertyContributor.html</file></files>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/lib/ant-contrib-0.6.jar b/plugins/org.eclipse.jst.jsf.doc.dev/lib/ant-contrib-0.6.jar
new file mode 100644
index 0000000..db90b0a
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/lib/ant-contrib-0.6.jar
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/lib/parseAPIPackages.jar b/plugins/org.eclipse.jst.jsf.doc.dev/lib/parseAPIPackages.jar
new file mode 100644
index 0000000..40e0cb1
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/lib/parseAPIPackages.jar
Binary files differ
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml b/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml
index 479dd87..b39f7b2 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/packages.xml
@@ -1 +1 @@
-<packages><package></package><package>org.eclipse.jst.jsf.common.dom</package><package>org.eclipse.jst.jsf.common.metadata</package><package>org.eclipse.jst.jsf.common.metadata.query</package><package>org.eclipse.jst.jsf.common.metadata.traittypes.traittypes</package><package>org.eclipse.jst.jsf.common.sets</package><package>org.eclipse.jst.jsf.common.sets.constraint</package><package>org.eclipse.jst.jsf.common.sets.mapping</package><package>org.eclipse.jst.jsf.common.util</package><package>org.eclipse.jst.jsf.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
+<packages><package></package><package>org.eclipse.jst.jsf.common.dom</package><package>org.eclipse.jst.jsf.common.metadata</package><package>org.eclipse.jst.jsf.common.metadata.query</package><package>org.eclipse.jst.jsf.common.metadata.traittypes.traittypes</package><package>org.eclipse.jst.jsf.common.sets</package><package>org.eclipse.jst.jsf.common.sets.constraint</package><package>org.eclipse.jst.jsf.common.sets.mapping</package><package>org.eclipse.jst.jsf.common.util</package><package>org.eclipse.jst.jsf.context</package><package>org.eclipse.jst.jsf.context.resolver</package><package>org.eclipse.jst.jsf.context.resolver.structureddocument</package><package>org.eclipse.jst.jsf.context.structureddocument</package><package>org.eclipse.jst.jsf.context.symbol</package><package>org.eclipse.jst.jsf.context.symbol.provider</package><package>org.eclipse.jst.jsf.context.symbol.source</package><package>org.eclipse.jst.jsf.core</package><package>org.eclipse.jst.jsf.core.jsfappconfig</package><package>org.eclipse.jst.jsf.core.jsflibraryconfiguration</package><package>org.eclipse.jst.jsf.core.jsflibraryregistry</package><package>org.eclipse.jst.jsf.core.set.constraint</package><package>org.eclipse.jst.jsf.core.set.mapping</package><package>org.eclipse.jst.jsf.core.tagmatcher</package><package>org.eclipse.jst.jsf.designtime</package><package>org.eclipse.jst.jsf.designtime.context</package><package>org.eclipse.jst.jsf.designtime.el</package><package>org.eclipse.jst.jsf.designtime.resolver</package><package>org.eclipse.jst.jsf.designtime.symbols</package><package>org.eclipse.jst.jsf.facesconfig.edit.provider</package><package>org.eclipse.jst.jsf.facesconfig.emf</package><package>org.eclipse.jst.jsf.facesconfig.emf.impl</package><package>org.eclipse.jst.jsf.facesconfig.emf.util</package><package>org.eclipse.jst.jsf.metadataprocessors</package><package>org.eclipse.jst.jsf.metadataprocessors.features</package><package>org.eclipse.jst.jsf.taglibprocessing.attributevalues</package><package>org.eclipse.jst.pagedesigner.converter</package><package>org.eclipse.jst.pagedesigner.dtmanager</package><package>org.eclipse.jst.pagedesigner.dtmanager.converter</package><package>org.eclipse.jst.pagedesigner.dtmanager.converter.operations</package><package>org.eclipse.jst.pagedesigner.dtmanager.dtinfo</package><package>org.eclipse.jst.pagedesigner.editors.properties</package><package>org.eclipse.jst.pagedesigner.editors.properties.quickedittabsections</package><package>org.eclipse.jst.pagedesigner.extensionpoint</package></packages>
\ No newline at end of file
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/plugins.xml b/plugins/org.eclipse.jst.jsf.doc.dev/plugins.xml
new file mode 100644
index 0000000..c3a2a0b
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/plugins.xml
@@ -0,0 +1,12 @@
+org.eclipse.jst.jsf.core;
+org.eclipse.jst.jsf.ui;
+org.eclipse.jst.jsf.facesconfig;
+org.eclipse.jst.jsf.facesconfig.ui;
+org.eclipse.jst.jsf.common;
+org.eclipse.jst.jsf.common.ui;
+org.eclipse.jst.jsf.common.runtime;
+org.eclipse.jst.jsf.standard.tagsupport;
+org.eclipse.jst.jsf.apache.trinidad.tagsupport;
+org.eclipse.jst.pagedesigner;
+org.eclipse.jst.pagedesigner.jsf.ui;
+org.eclipse.jst.pagedesigner.jsp.core;
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/srcFolders.txt b/plugins/org.eclipse.jst.jsf.doc.dev/srcFolders.txt
new file mode 100644
index 0000000..12243ce
--- /dev/null
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/srcFolders.txt
@@ -0,0 +1,12 @@
+/org.eclipse.jst.jsf.core/src;
+/org.eclipse.jst.jsf.ui/src;
+/org.eclipse.jst.jsf.facesconfig/facesconfig;
+/org.eclipse.jst.jsf.facesconfig.ui/src;
+/org.eclipse.jst.jsf.common/src;
+/org.eclipse.jst.jsf.common.ui/src;
+/org.eclipse.jst.jsf.common.runtime/src;
+/org.eclipse.jst.jsf.standard.tagsupport/src;
+/org.eclipse.jst.jsf.apache.trinidad.tagsupport/src;
+/org.eclipse.jst.pagedesigner/src;
+/org.eclipse.jst.pagedesigner.jsf.ui/src;
+/org.eclipse.jst.pagedesigner.jsp.core/src;
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml b/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml
index 72ce7e7..84962a3 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/tocreference.xml
@@ -5,27 +5,8 @@
 	<topic label="API Reference" href="html/api_reference/overview-summary.html">
 		<link toc="javadoctoc.xml" />
 	</topic>
+	
 	<topic label="Extension Points Reference" href="html/extpts_reference/index.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.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"/>
+		<link toc="topics_ExtPoint_Reference.xml" />
 	</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
index 54b5060..5fe316a 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/topics_ExtPoint_Reference.xml
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/topics_ExtPoint_Reference.xml
@@ -1,8 +1,7 @@
 <?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"/>
+	 	<toc label="Ext-pts Reference">
 <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"/>
@@ -17,10 +16,7 @@
 <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>