M4 build - includes VPD
diff --git a/releng.jsf/maps/jsf-doc.map b/releng.jsf/maps/jsf-doc.map
index ac4c987..ecfe1ac 100644
--- a/releng.jsf/maps/jsf-doc.map
+++ b/releng.jsf/maps/jsf-doc.map
@@ -1,9 +1,9 @@
 !*************** wtp jsf  docs map
 
-feature@org.eclipse.jst.jsf.doc.feature=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/features/org.eclipse.jst.jsf.doc.feature
+feature@org.eclipse.jst.jsf.doc.feature=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/features/org.eclipse.jst.jsf.doc.feature
 
-plugin@org.eclipse.jst.jsf.doc.user=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.user
-plugin@org.eclipse.jst.jsf.doc.dev=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.dev
+plugin@org.eclipse.jst.jsf.doc.user=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.user
+plugin@org.eclipse.jst.jsf.doc.dev=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/doc/plugins/org.eclipse.jst.jsf.doc.dev
 
 
 !*************** 
\ No newline at end of file
diff --git a/releng.jsf/maps/jsf.map b/releng.jsf/maps/jsf.map
index 7cf3393..0a10b28 100644
--- a/releng.jsf/maps/jsf.map
+++ b/releng.jsf/maps/jsf.map
@@ -1,7 +1,7 @@
 !*************** jsf product plugin and assembly features
 
-plugin@org.eclipse.jsf=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/plugins/org.eclipse.jsf.branding
+plugin@org.eclipse.jsf=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/plugins/org.eclipse.jsf.branding
 
-feature@org.eclipse.jsf=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/features/org.eclipse.jsf.feature
+feature@org.eclipse.jsf=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/assembly/features/org.eclipse.jsf.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/maps/wtp.jsf.map b/releng.jsf/maps/wtp.jsf.map
index 2d6f667..c7d5957 100644
--- a/releng.jsf/maps/wtp.jsf.map
+++ b/releng.jsf/maps/wtp.jsf.map
@@ -1,30 +1,22 @@
 !*************** jsf product plugins and features
 
 
-plugin@org.eclipse.jst.jsf.core=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
-plugin@org.eclipse.jst.jsf.ui=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
+plugin@org.eclipse.jst.jsf.core=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.core
+plugin@org.eclipse.jst.jsf.ui=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.ui
 
-plugin@org.eclipse.jst.jsf.facesconfig=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig
-plugin@org.eclipse.jst.jsf.facesconfig.common=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.common
-plugin@org.eclipse.jst.jsf.facesconfig.edit=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.edit
-plugin@org.eclipse.jst.jsf.facesconfig.ui=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
+plugin@org.eclipse.jst.jsf.facesconfig=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig
+plugin@org.eclipse.jst.jsf.facesconfig.ui=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui
+plugin@org.eclipse.jst.jsf.common=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common
+plugin@org.eclipse.jst.jsf.common.ui=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common.ui
 
-plugin@org.eclipse.jst.jsf.common=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.common
-plugin@org.eclipse.jst.jsf.metadataprocessors=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.metadataprocessors
-plugin@org.eclipse.jst.jsf.context.symbol=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.context.symbol
-plugin@org.eclipse.jst.jsf.validation.el=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.validation.el
-plugin@org.eclipse.jst.jsf.contentassist=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.contentassist.el
-plugin@org.eclipse.jst.jsf.designtime=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.designtime
+plugin@org.eclipse.jst.jsf.standard.tagsupport=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport
+
+plugin@org.eclipse.jst.pagedesigner=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
+plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
+plugin@org.eclipse.jst.pagedesigner.jsp.core=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
 
 
-plugin@org.eclipse.jst.jsf.taglibprocessing=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.jsf.taglibprocessing
-plugin@org.eclipse.jst.pagedesigner=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner
-plugin@org.eclipse.jst.pagedesigner.common=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.common
-plugin@org.eclipse.jst.pagedesigner.jsf.ui=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui
-plugin@org.eclipse.jst.pagedesigner.jsp.core=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core
-
-
-feature@org.eclipse.jst.jsf.feature=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.feature
-feature@org.eclipse.jst.jsf_sdk.feature=v200608180819,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf_sdk.feature
+feature@org.eclipse.jst.jsf.feature=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.feature
+feature@org.eclipse.jst.jsf_sdk.feature=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf_sdk.feature
 
 !***************
\ No newline at end of file
diff --git a/releng.jsf/maps/wtp.jsf.tests.map b/releng.jsf/maps/wtp.jsf.tests.map
index 31aa5cb..1a4c719 100644
--- a/releng.jsf/maps/wtp.jsf.tests.map
+++ b/releng.jsf/maps/wtp.jsf.tests.map
@@ -1,12 +1,13 @@
 !*************** wtp jsf tests map
 
-feature@org.eclipse.jst.jsf.tests.feature=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.tests.feature
+feature@org.eclipse.jst.jsf.tests.feature=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/features/org.eclipse.jst.jsf.tests.feature
 
-plugin@org.eclipse.jst.jsf.core.tests=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.core.tests
-plugin@org.eclipse.jst.jsf.ui.tests=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.ui.tests
+plugin@org.eclipse.jst.jsf.core.tests=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.core.tests
+plugin@org.eclipse.jst.jsf.ui.tests=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.ui.tests
 
-plugin@org.eclipse.jst.jsf.metadata.tests=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadata.tests
-plugin@org.eclipse.jst.jsf.contentassist.tests=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.contentassist.tests
-plugin@org.eclipse.jst.jsf.metadataprocessingtests2=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
-plugin@org.eclipse.jst.jsf.test.util=v20061127,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.test.util
+plugin@org.eclipse.jst.jsf.metadata.tests=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadata.tests
+plugin@org.eclipse.jst.jsf.contentassist.tests=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.contentassist.tests
+plugin@org.eclipse.jst.jsf.metadataprocessingtests2=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.metadataprocessingtests2
+plugin@org.eclipse.jst.jsf.test.util=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.test.util
+plugin@org.eclipse.jst.jsf.context.symbol.tests=v20061207,:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools,,org.eclipse.jsf/components/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests
 !*************** 
\ No newline at end of file