updated for M4
diff --git a/development/milestone_plans/reports/help-wanted.html b/development/milestone_plans/reports/help-wanted.html
index 5c443f6..a04619e 100644
--- a/development/milestone_plans/reports/help-wanted.html
+++ b/development/milestone_plans/reports/help-wanted.html
@@ -4,7 +4,7 @@
 <link rel="stylesheet" type="text/css" href="../stylesheets/images/default_style.css"/>
 </head>
 <body>
-<table xmlns:xalan="http://xml.apache.org/xslt" border="0" width="100%" cellPadding="2" cellSpacing="5">
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
 <tr>
 <td>
 <font class="indextop">eclipse WTP help wanted</font>
@@ -60,7 +60,7 @@
 </td>
 <td>WSDL Model</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Investigate initial WSDL model API requirements  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Investigate initial WSDL model API requirements  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -75,7 +75,7 @@
 </td>
 <td>Miscellaneous</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Add JUnit testcases to exercise Web service wizards scenarios.  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Add JUnit testcases to exercise Web service wizards scenarios.  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -90,7 +90,7 @@
 </td>
 <td>Miscellaneous</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -105,7 +105,7 @@
 </td>
 <td>Miscellaneous</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Add JUnit testcases to exercise Environment Command and Dynamic Wizard frameworks.  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Add JUnit testcases to exercise Environment Command and Dynamic Wizard frameworks.  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -120,26 +120,22 @@
 </td>
 <td>Miscellaneous</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
 <td>
-<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M3%20wst.css:%20Eclipse%20Base%20Parity&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
-						CSS%20Validation
-					">Send</a>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M3%20wst.internet:%20Internet%20Proxy%20Preferences&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Develop%20JUnit%20tests%20for%20proxy%20settings">Send</a>
 </td>
 <td>M3</td>
 <td>medium</td>
 <td>wst</td>
 <td>
-<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>
+<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>
 </td>
-<td>Eclipse Base Parity</td>
+<td>Internet Proxy Preferences</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;
-						CSS Validation
-					  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Develop JUnit tests for proxy settings  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -154,7 +150,7 @@
 </td>
 <td>Miscellaneous</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Add JUnit testcases to exercise Web Service Explorer and WSParser function.  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Add JUnit testcases to exercise Web Service Explorer and WSParser function.  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -169,7 +165,7 @@
 </td>
 <td>Miscellaneous</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -184,7 +180,7 @@
 </td>
 <td>WSDL Model</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Add JUnit test cases for WSDL model  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Add JUnit test cases for WSDL model  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -199,7 +195,7 @@
 </td>
 <td>API Stability</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;API coverage and testing  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;API coverage and testing  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -214,7 +210,82 @@
 </td>
 <td>Miscellaneous</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M4%20wst.command:%20Miscellaneous&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Housekeeping:%20Clean%20up%20compilation%20warnings.%20Common%20cases:">Send</a>
+</td>
+<td>M4</td>
+<td>high</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>
+</td>
+<td>Miscellaneous</td>
+<td>
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M4%20wst.ws:%20Miscellaneous&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Housekeeping:%20Clean%20up%20compilation%20warnings.%20Common%20cases:">Send</a>
+</td>
+<td>M4</td>
+<td>high</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/ws/M4/milestone_plan.html">ws</a>
+</td>
+<td>Miscellaneous</td>
+<td>
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Housekeeping: Clean up compilation warnings. Common cases:  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M4%20wst.wsdl:%20WSDL%20Model&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Provide%20WSDL%20model%20API">Send</a>
+</td>
+<td>M4</td>
+<td>high</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>
+</td>
+<td>WSDL Model</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Provide WSDL model API  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M4%20jst.j2ee:%20Flexible%20project%20structure&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Identify%20flexible%20scenarios,%20and%20generate%20testplan">Send</a>
+</td>
+<td>M4</td>
+<td>medium</td>
+<td>jst</td>
+<td>
+<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>
+</td>
+<td>Flexible project structure</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Identify flexible scenarios, and generate testplan  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M4%20jst.j2ee:%20Validators&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Extract%20core%20functionality%20in%20the%20XML%20Validator%20Helper%20to%20Validation%20Framework">Send</a>
+</td>
+<td>M4</td>
+<td>medium</td>
+<td>jst</td>
+<td>
+<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>
+</td>
+<td>Validators</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Extract core functionality in the XML Validator Helper to Validation Framework  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -229,7 +300,7 @@
 </td>
 <td>Apache Axis</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Enable Web service wizards to target Apache Axis 1.2 RC2 (or later), not just 1.1.  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Enable Web service wizards to target Apache Axis 1.2 RC2 (or later), not just 1.1.  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -244,7 +315,7 @@
 </td>
 <td>Apache Axis</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Expose all Axis emitter options in the wizard extensions (and/or in preference pages).  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Expose all Axis emitter options in the wizard extensions (and/or in preference pages).  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -259,7 +330,7 @@
 </td>
 <td>Apache Axis</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Integrate generation of Axis JUnit tests into Test Facility extension point.  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Integrate generation of Axis JUnit tests into Test Facility extension point.  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -276,9 +347,9 @@
 </td>
 <td>Performance</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;
 						Identify and resolve memory leaks.
-					  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+					  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -295,9 +366,9 @@
 </td>
 <td>Performance</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;
 						Identify and remove non-thread safe code.
-					  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+					  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -314,9 +385,9 @@
 </td>
 <td>Eclipse Base Parity</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;
 						DTD Content Assist
-					  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+					  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -331,7 +402,7 @@
 </td>
 <td>Overall XSD UI</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Investigate XSD Editor API requirements  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Investigate XSD Editor API requirements  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -346,7 +417,7 @@
 </td>
 <td>Apache Axis</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Enable Web service wizards to target Apache Axis 1.0, not just 1.1.  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Enable Web service wizards to target Apache Axis 1.0, not just 1.1.  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -361,7 +432,7 @@
 </td>
 <td>Overall XSD UI</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Investigate XSD search function to find component refences in XSD, WSDL and XML  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Investigate XSD search function to find component refences in XSD, WSDL and XML  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 <tr>
@@ -376,13 +447,285 @@
 </td>
 <td>Overall XSD UI</td>
 <td>
-<img xmlns:xalan="http://xml.apache.org/xslt" width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Implement 'Open Declaration' support  <img xmlns:xalan="http://xml.apache.org/xslt" width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Implement 'Open Declaration' support  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20jst.jsp:%20Design%20and%20API%20Verification&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Sample%20JET%20Editor">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>jst</td>
+<td>
+<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>
+</td>
+<td>Design and API Verification</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Sample JET Editor  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20jst.jsp:%20Design%20and%20API%20Verification&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Sample%20PHP%20Editor">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>jst</td>
+<td>
+<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>
+</td>
+<td>Design and API Verification</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Sample PHP Editor  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20jst.jsp:%20JSP%202.0%20Spec.%20Compliance&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20allow%20editing%20of%20tag%20files
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>jst</td>
+<td>
+<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>
+</td>
+<td>JSP 2.0 Spec. Compliance</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;
+                                                allow editing of tag files
+                                          <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20jst.jsp:%20JSP%202.0%20Spec.%20Compliance&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20Expression%20Language%20(EL)%20highlighting.
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>jst</td>
+<td>
+<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>
+</td>
+<td>JSP 2.0 Spec. Compliance</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;
+                                                Expression Language (EL) highlighting.
+                                          <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20jst.jsp:%20JSP%202.0%20Spec.%20Compliance&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20Expression%20Language%20(EL)%20content%20assist.
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>jst</td>
+<td>
+<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>
+</td>
+<td>JSP 2.0 Spec. Compliance</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;
+                                                Expression Language (EL) content assist.
+                                          <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.css:%20Eclipse%20Base%20Parity&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20CSS%20Validation">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/css/M4/milestone_plan.html">css</a>
+</td>
+<td>Eclipse Base Parity</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;CSS Validation  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.dtd:%20Eclipse%20Base%20Parity&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20DTD%20Content%20Assist">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/dtd/M4/milestone_plan.html">dtd</a>
+</td>
+<td>Eclipse Base Parity</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;DTD Content Assist  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.dtd:%20Eclipse%20Base%20Parity&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
+						implement%20DTD%20property%20sheets
+					">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/dtd/M4/milestone_plan.html">dtd</a>
+</td>
+<td>Eclipse Base Parity</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;
+						implement DTD property sheets
+					  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.wsdl:%20WSDL%20Model&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Add%20JUnit%20test%20cases%20for%20WSDL%20model">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>
+</td>
+<td>WSDL Model</td>
+<td>
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>&nbsp;&nbsp;Add JUnit test cases for WSDL model  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.xml:%20Design%20for%20Platform%20Use&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Improve%20JUnit%20Coverage">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>
+</td>
+<td>Design for Platform Use</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Improve JUnit Coverage  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.xsd:%20Overall%20XSD%20UI&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Investigate%20additional%20API%20requirements">Send</a>
+</td>
+<td>M5</td>
+<td>medium</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>
+</td>
+<td>Overall XSD UI</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Investigate additional API requirements  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.css:%20WTP%20Integration&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
+						Add%20&quot;preview&quot;%20page%20(or%20view)%20as%20there%20is%20for
+						JavaScript%20Editor.
+					">Send</a>
+</td>
+<td>M5</td>
+<td>low</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/css/M4/milestone_plan.html">css</a>
+</td>
+<td>WTP Integration</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;
+						Add "preview" page (or view) as there is for
+						JavaScript Editor.
+					  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.sse:%20New%20Features&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
+						Use%20Base%20Spell%20Checking%20with%20Validation
+						Framework
+					">Send</a>
+</td>
+<td>M5</td>
+<td>low</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>
+</td>
+<td>New Features</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;
+						Use Base Spell Checking with Validation
+						Framework
+					  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.xml:%20Eclipse%20base%20parity&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20Improve%20formatting%20options
+%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20">Send</a>
+</td>
+<td>M5</td>
+<td>low</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>
+</td>
+<td>Eclipse base parity</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;
+                                                Improve formatting options
+                                          <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.xsd:%20Overall%20XSD%20UI&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Investigate%20XSD%20search%20function%20to%20find%20component%20refences%20in%20XSD,%20WSDL%20and%20XML">Send</a>
+</td>
+<td>M5</td>
+<td>low</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>
+</td>
+<td>Overall XSD UI</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>&nbsp;&nbsp;Investigate XSD search function to find component refences in XSD, WSDL and XML  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td>
+<a href="mailto:wtp-dev@eclipse.org?subject=[Help%20Wanted]%20M5%20wst.xsd:%20Overall%20XSD%20UI&amp;body=I'd%20like%20to%20help%20with%20the%20item:%20Implement%20'Open%20Declaration'%20support">Send</a>
+</td>
+<td>M5</td>
+<td>low</td>
+<td>wst</td>
+<td>
+<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>
+</td>
+<td>Overall XSD UI</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>&nbsp;&nbsp;Implement 'Open Declaration' support  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
 </table>
 <br/>
 <br/>
-<table xmlns:xalan="http://xml.apache.org/xslt" border="0" width="100%" cellpadding="2" cellspacing="5">
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
 <tbody>
 <tr>
 <td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
diff --git a/development/milestone_plans/reports/performance.html b/development/milestone_plans/reports/performance.html
index 1f80325..1d0ed20 100644
--- a/development/milestone_plans/reports/performance.html
+++ b/development/milestone_plans/reports/performance.html
@@ -1,4 +1,4 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xalan="http://xml.apache.org/xslt">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <head>
 <title>Eclipse WTP performance improvement plan</title>
 <link rel="stylesheet" type="text/css" href="../stylesheets/images/default_style.css"/>
@@ -22,50 +22,6 @@
 <table width="100%">
 <tr>
 <td colspan="2" bgcolor="#0080c0" height="20">
-<a name="wstserverM4"/>
-<b>
-<font color="#ffffff">wst server M4</font>
-</b>
-</td>
-<td/>
-</tr>
-</table>
-<table>
-<tr>
-<td>
-<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
-</td>
-<td>
-<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
-<b>Validate server.core plugin startup times</b>
-					&nbsp;[medium]
-					</td>
-</tr>
-</table>
-<table>
-<tr>
-<td valign="top">
-<i>Steps:</i>
-</td>
-<td>
-<ol>
-<li>
-<description>Validate plugin startup and delegate load times</description>
-</li>
-<li>
-<description>Fix delay when right clicking on server in Servers view</description>
-</li>
-<li>
-<description>Set performance benchmarks</description>
-</li>
-</ol>
-</td>
-</tr>
-</table>
-<br/>
-<table width="100%">
-<tr>
-<td colspan="2" bgcolor="#0080c0" height="20">
 <a name="wstsseM3"/>
 <b>
 <font color="#ffffff">wst sse M3</font>
@@ -93,8 +49,7 @@
 <td valign="top">
 <i>Detail:</i>
 </td>
-<td>
-<detail>
+<td><detail>
 						Use separate data structure. Investigate
 						generated JavaCC parser on JFlex tokens.
 						This should have a notable effect on the speed 
@@ -305,6 +260,298 @@
 <table width="100%">
 <tr>
 <td colspan="2" bgcolor="#0080c0" height="20">
+<a name="wstserverM4"/>
+<b>
+<font color="#ffffff">wst server M4</font>
+</b>
+</td>
+<td/>
+</tr>
+</table>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+<b>Validate server.core plugin startup times</b>
+					&nbsp;[medium]
+					</td>
+</tr>
+</table>
+<table>
+<tr>
+<td valign="top">
+<i>Steps:</i>
+</td>
+<td>
+<ol>
+<li>
+<description>Validate plugin startup and delegate load times</description>
+</li>
+<li>
+<description>Fix delay when right clicking on server in Servers view</description>
+</li>
+<li>
+<description>Set performance benchmarks</description>
+</li>
+</ol>
+</td>
+</tr>
+</table>
+<br/>
+<table width="100%">
+<tr>
+<td colspan="2" bgcolor="#0080c0" height="20">
+<a name="wstsseM4"/>
+<b>
+<font color="#ffffff">wst sse M4</font>
+</b>
+</td>
+<td/>
+</tr>
+</table>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<b>
+						Improve partitioner's performance.
+					</b>
+					&nbsp;[low]
+					</td>
+</tr>
+</table>
+<table>
+<tr>
+<td valign="top">
+<i>Detail:</i>
+</td>
+<td>
+<detail>
+						Use separate data structure. Investigate
+						generated JavaCC parser on JFlex tokens. This
+						should have a notable effect on the speed on the
+						scrolling speed in the editor.
+					</detail>
+</td>
+</tr>
+</table>
+<br/>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<b>
+						Move to latest version of JFlex
+					</b>
+					&nbsp;[low]
+					</td>
+</tr>
+</table>
+<table>
+<tr>
+<td valign="top">
+<i>Detail:</i>
+</td>
+<td>
+<detail>
+						This may help the scrolling speed in the editor.
+					</detail>
+</td>
+</tr>
+</table>
+<br/>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<b>
+						Investigate numerous model and document
+						implementation improvements
+					</b>
+					&nbsp;[low]
+					</td>
+</tr>
+</table>
+<table>
+<tr>
+<td valign="top">
+<i>Detail:</i>
+</td>
+<td>
+<detail>
+						
+<ul>
+							
+<li>
+								Add (transparent) model caching (not
+								just sharing)
+							</li>
+
+							
+<li>
+								Limit number of adapter notifications
+								sent (and/or optimize 2000 peer children
+								case). This may help speed up the
+								formatter performance.
+							</li>
+
+							
+<li>
+								Fix document to model thread
+								(notification) synchronization
+							</li>
+
+							
+<li>
+								Fix "stop/resume" notifications (now
+								rewrite modes)
+							</li>
+
+							
+<li>
+								Investigate improved text store, better
+								suited to DOM editing
+							</li>
+
+							
+<li>
+								Investigate Add "compare" methods, so
+								less frequent 'gets' are needed
+							</li>
+						
+</ul>
+					
+</detail>
+</td>
+</tr>
+</table>
+<br/>
+<table width="100%">
+<tr>
+<td colspan="2" bgcolor="#0080c0" height="20">
+<a name="wstsseM5"/>
+<b>
+<font color="#ffffff">wst sse M5</font>
+</b>
+</td>
+<td/>
+</tr>
+</table>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+<b>
+						Improve "adapt on create" design and
+						implementation.
+					</b>
+					&nbsp;[medium]
+					</td>
+</tr>
+</table>
+<table/>
+<br/>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+<b>
+						Improve "read-only" design
+					</b>
+					&nbsp;[medium]
+					</td>
+</tr>
+</table>
+<table/>
+<br/>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+<b>
+						Improve formatter performance
+					</b>
+					&nbsp;[medium]
+					</td>
+</tr>
+</table>
+<table>
+<tr>
+<td valign="top">
+<i>Detail:</i>
+</td>
+<td>
+<detail>
+						We believe the main problem is excessive
+						notifications for formatting large areas of
+						text. We should be able to know that formatting
+						is happening, and perform all edits at once with
+						minimal notifications of elements changing,
+						especially since it's "only" whitespace being
+						changed.
+					</detail>
+</td>
+</tr>
+</table>
+<br/>
+<table>
+<tr>
+<td>
+<img height="16" border="0" nosave="" src="../stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+<b>
+						Investigate "sparse model" design for memory
+						savings
+					</b>
+					&nbsp;[medium]
+					</td>
+</tr>
+</table>
+<table>
+<tr>
+<td valign="top">
+<i>Detail:</i>
+</td>
+<td>
+<detail>
+						A possible improvement may be to perform a
+						"coarse" parsing the first time though. That is,
+						only parse StructurdDocumentRegions, then only
+						provide finer details of those regions upon
+						request. This is more along the lines of "pay as
+						you go", which seems to be the overall direction
+						of Eclipse.
+					</detail>
+</td>
+</tr>
+</table>
+<br/>
+<table width="100%">
+<tr>
+<td colspan="2" bgcolor="#0080c0" height="20">
 <a name="jstwsM4"/>
 <b>
 <font color="#ffffff">jst ws M4</font>
diff --git a/development/milestone_plans/reports/report-milestone-overview.html b/development/milestone_plans/reports/report-milestone-overview.html
index 821df0f..e1cf15b 100644
--- a/development/milestone_plans/reports/report-milestone-overview.html
+++ b/development/milestone_plans/reports/report-milestone-overview.html
@@ -1,4 +1,4 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xalan="http://xml.apache.org/xslt">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <head>
 <title>eclipse WTP milestone plan</title>
 <link rel="stylesheet" type="text/css" href="../stylesheets/images/default_style.css"/>
@@ -61,9 +61,47 @@
 <b>M4</b>
 </a>
 										-
-										<statusDescription>April 25</statusDescription>
+										<statusDescription>April 22</statusDescription>
 <br>
-<contentDescription>to be determined</contentDescription>
+<contentDescription>WTP 1.0 API Definition Complete. Based on Eclipse 3.1 M6</contentDescription>
+</br>
+</p>
+</td>
+</tr>
+<tr>
+<td width="3%" vAlign="top">
+<p align="right">
+<img alt="" name="Image2" border="0" align="bottom" width="16" src="../stylesheets/images/Adarrow.gif" height="16"/>
+</p>
+</td>
+<td width="97%">
+<p>
+<a href="#M5">
+<b>M5</b>
+</a>
+										-
+										<statusDescription>June 17, 2005</statusDescription>
+<br>
+<contentDescription>WTP 1.0 API Implementation Complete. Based on Eclipse 3.1 M7</contentDescription>
+</br>
+</p>
+</td>
+</tr>
+<tr>
+<td width="3%" vAlign="top">
+<p align="right">
+<img alt="" name="Image2" border="0" align="bottom" width="16" src="../stylesheets/images/Adarrow.gif" height="16"/>
+</p>
+</td>
+<td width="97%">
+<p>
+<a href="#M6-Endgame">
+<b>M6-Endgame</b>
+</a>
+										-
+										<statusDescription>uly 29, 2005</statusDescription>
+<br>
+<contentDescription>Stabilization, final bug fixes. Based on Eclipse 3.1 Release</contentDescription>
 </br>
 </p>
 </td>
@@ -196,6 +234,38 @@
 <td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
 </td>
+<td>[<a href="../../../jst/components/server/M3/milestone_plan.html">server</a>] <description>Adjust generic server to server tools API changes and fix bugs</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/server/M3/milestone_plan.html">server</a>] <description>Adjust JBoss to server tools API changes and fix bugs</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../jst/components/server/M3/milestone_plan.html">server</a>] <description>Minor Tomcat API cleanup, fix bugs</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../jst/components/server/M3/milestone_plan.html">server</a>] <description>Provide extensions for easier providing of generic server definitions</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
 <td>[<a href="../../../jst/components/ws/M3/milestone_plan.html">ws</a>] <description>Enable extensible Web services wizards in support of Apache Axis.</description>
 </td>
 </tr>
@@ -288,6 +358,22 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>] <description>Switch internal web browser to use the Eclipse status line</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>] <description>Web browser and TCP/IP monitor API cleanup and improvement</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/javascript/M3/milestone_plan.html">javascript</a>] <description>
@@ -322,6 +408,38 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/server/M3/milestone_plan.html">server</a>] <description>Add expression support to moduleArtifactAdapter extension point</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/server/M3/milestone_plan.html">server</a>] <description>API cleanup and improvement</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/server/M3/milestone_plan.html">server</a>] <description>Automatic publish/sync to local/remote servers</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/server/M3/milestone_plan.html">server</a>] <description>Change runtime search to work via a path</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/sse/M3/milestone_plan.html">sse</a>] <description>
@@ -610,6 +728,30 @@
 <td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>
 </td>
+<td>[<a href="../../../jst/components/server/M3/milestone_plan.html">server</a>] <description>Editors for generic Runtime/Server</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/server/M3/milestone_plan.html">server</a>] <description>JBoss support for flexible project layout</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../jst/components/server/M3/milestone_plan.html">server</a>] <description>Write more JUnit tests for Tomcat</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
 <td>[<a href="../../../jst/components/ws/M3/milestone_plan.html">ws</a>] <description>Add JUnit testcases to exercise Web service wizards scenarios.</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </td>
 </tr>
@@ -773,6 +915,46 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>] <description>Create more JUnit tests for TCP/IP monitor</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>] <description>Create more JUnit tests for Web browser</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td>[<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>] <description>Develop JUnit tests for proxy settings</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td>[<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>] <description>Investigate moving the Web browser's toolbar to main Eclipse toolbar</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/internet/M3/milestone_plan.html">internet</a>] <description>Support nonProxyHosts</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/javascript/M3/milestone_plan.html">javascript</a>] <description>
@@ -784,6 +966,30 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/server/M3/milestone_plan.html">server</a>] <description>Consistent job handling for Run on Server</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/server/M3/milestone_plan.html">server</a>] <description>Increase JUnit test coverage</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td>[<a href="../../../wst/components/server/M3/milestone_plan.html">server</a>] <description>Publish jobs using customized job dialog</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/sse/M3/milestone_plan.html">sse</a>] <description>
@@ -1122,6 +1328,126 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Bring back sed adapter for real time XML/EMF Editing</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Continue to collect/publish plans/doc/api/whats new/tutorials</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Deployment of EAR using flexible project structure</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Existing module project migration - Tacit Builder that migrates old Natures/Builders to ModuleCore</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Expand Flex project support to all J2EE module types including webservices</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Flex code refactor: Removing old project Nature/Editmodel dependencies </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Incremental support for the Flexible Project Builder</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Milestone to milestone</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Module Creation/Import/Export wizards refactored for Flex project</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Perform JUnit for any exposed api/function</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Plan for Eclipse Base integration</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Pushing common deployables/ deployable factory code including (the flexible project support) to server framework</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Refactor wizards to work with modules, not projects</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Resolve Websettings/J2EE metadata issues - UI preferences[high]</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Working Sets for the Project Navigator including the Quick ("Last 5") menu options</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../jst/components/jsp/M3/milestone_plan.html">jsp</a>] <description>
@@ -1133,6 +1459,17 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Document Designs, API, JUnit Tests, Performance
+                                                Tests
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../jst/components/server/M4/milestone_plan.html">server</a>] <description>API cleanup and bug fixes</description>
@@ -1141,6 +1478,14 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/server/M4/milestone_plan.html">server</a>] <description>Generic server API cleanup and resolve bug reports</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
 </td>
 <td>[<a href="../../../jst/components/ws/M4/milestone_plan.html">ws</a>] <description>
@@ -1269,6 +1614,32 @@
 <td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Housekeeping: Clean up compilation warnings. Common cases:</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Integrate missing JavaDoc.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/css/M4/milestone_plan.html">css</a>] <description>
+						Document Designs, API, and JUnit tests
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
 <td>[<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>] <description>
 						Finish Document Designs, API, and JUnit tests
 					</description>
@@ -1277,6 +1648,16 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/dtd/M4/milestone_plan.html">dtd</a>] <description>
+						Document Designs, API, and JUnit tests
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/dtd/M3/milestone_plan.html">dtd</a>] <description>
@@ -1287,6 +1668,16 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/html/M4/milestone_plan.html">html</a>] <description>
+						Document Designs, API, and JUnit tests
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/internet/M4/milestone_plan.html">internet</a>] <description>API cleanup</description>
@@ -1305,6 +1696,16 @@
 <td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
+<td>[<a href="../../../wst/components/javascript/M4/milestone_plan.html">javascript</a>] <description>
+						Document Designs, API, and JUnit tests
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
 <td>[<a href="../../../wst/components/javascript/M3/milestone_plan.html">javascript</a>] <description>
 						Finish Document Designs, API, and JUnit tests
 					</description>
@@ -1337,6 +1738,17 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Document Designs, API, JUnit tests, and
+						Performance Tests
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/sse/M3/milestone_plan.html">sse</a>] <description>
@@ -1365,6 +1777,65 @@
 <td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
+<td>[<a href="../../../wst/components/ws/M4/milestone_plan.html">ws</a>] <description>Housekeeping: Clean up compilation warnings. Common cases:</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/ws/M4/milestone_plan.html">ws</a>] <description>Integrate missing JavaDoc.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/ws/M4/milestone_plan.html">ws</a>] <description>Remove dependencies on JST components.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Provide API/extension point for extensibility element models</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Provide API/extension points for extensibility element support in UI (<i>investigate push down to xml.ui</i>)</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Provide WSDL model API</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                Document Designs, API, JUnit tests, and
+                                                Performance Tests
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
 <td>[<a href="../../../wst/components/xml/M3/milestone_plan.html">xml</a>] <description>
 						Finish Document Designs, API, and JUnit tests
 					</description>
@@ -1386,6 +1857,22 @@
 <td>[<a href="../../../wst/components/xsd/M3/milestone_plan.html">xsd</a>] <description>Improve &lt;annotation&gt; editing</description>
 </td>
 </tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Provide API and extension points for specialized <i>annotation</i> editing views</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Support API for contributing menu items to graph and outline views</description>
+</td>
+</tr>
 </table>
 </ul>
 </td>
@@ -1404,6 +1891,164 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Add all EJB bean type creation</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>API: Annotation Framework</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>API: Edit Model</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>API: WTP Wizard Framework</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Create document for flexible project api changes for extended teams to react</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Create ext. framework for adding annotation builders</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Create plugable extensions for creation wizards</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>EJB support with ServiceRef code generation (Axis)</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Extract core functionality in the XML Validator Helper to Validation Framework</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Identify flexible scenarios, and generate testplan</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Module discovery wizard</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>More context-aware menu options</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Provide exclusion filters to exclude project folders from validating</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>React J2EE Validators for Flexible project structure changes (except War Validator)</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Refactoring the adapters to extension points - collaborate with server team</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Run existing validatiors on different content types using Eclipse Content Type</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Upgrade to 1.4 level of xdoclet tag sets</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Continue refactoring to improve separation of
+                                                components.
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Fix/improve taglib lookup to work with flexible
+                                                project structures
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../jst/components/jsp/M3/milestone_plan.html">jsp</a>] <description>JSP Batch validation.</description>
@@ -1412,6 +2057,14 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>New File Wizard</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../jst/components/jsp/M3/milestone_plan.html">jsp</a>] <description>Sample JET Editor</description>
@@ -1428,6 +2081,14 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/server/M4/milestone_plan.html">server</a>] <description>Complete the implementation of server tooling APIs</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
 </td>
 <td>[<a href="../../../jst/components/ws/M4/milestone_plan.html">ws</a>] <description>Define extensions to Web Services Explorer's "WSDL Processor" extension point.</description>
@@ -1516,6 +2177,41 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Exploit event listener mechanism in command engine to completely separate GUI from non-GUI components.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Redesign event listener mechanism in command engine to completely separate GUI from non-GUI components.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Refactor packages and classes across the three plugins, since some classes are currently mislocated.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/css/M4/milestone_plan.html">css</a>] <description>
+						continue refactoring to improve separation of
+						components
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/css/M3/milestone_plan.html">css</a>] <description>
@@ -1537,6 +2233,17 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td>[<a href="../../../wst/components/dtd/M4/milestone_plan.html">dtd</a>] <description>
+						Finish refactoring to improve separation of
+						components
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
 <td>[<a href="../../../wst/components/dtd/M3/milestone_plan.html">dtd</a>] <description>
@@ -1558,6 +2265,25 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/html/M4/milestone_plan.html">html</a>] <description>
+						Continue refactoring to improve separation of
+						components.
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/html/M4/milestone_plan.html">html</a>] <description>New File Wizard</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/html/M3/milestone_plan.html">html</a>] <description>
@@ -1570,6 +2296,17 @@
 <td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
+<td>[<a href="../../../wst/components/javascript/M4/milestone_plan.html">javascript</a>] <description>
+						continue refactoring to improve separation of
+						components
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
 <td>[<a href="../../../wst/components/javascript/M3/milestone_plan.html">javascript</a>] <description>
 						Finish refactoring to improve separation of
 						components
@@ -1619,6 +2356,36 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Conform to base Eclipse Selection
+						management/providers
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Continue refactoring to improve separation of
+						components
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>Folding</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/sse/M3/milestone_plan.html">sse</a>] <description>
@@ -1639,6 +2406,17 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Improve Document, Position, Model
+						synchronization
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/sse/M3/milestone_plan.html">sse</a>] <description>
@@ -1661,6 +2439,122 @@
 <td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Move closer to IDocument compliance.
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Need to refactor snippets to model and view
+						components
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Reduce Editor/Viewer subclassing
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>Task Tags from contents</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/ws/M4/milestone_plan.html">ws</a>] <description>Distinguish between "live" and "dead" WSDL in the Web Services Explorer.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/ws/M4/milestone_plan.html">ws</a>] <description>Phase out Apache SOAP.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/ws/M4/milestone_plan.html">ws</a>] <description>Support tunnelling Web service calls thru basic authenticating firewall proxies (see bug <a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=84945">84945</a>).</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Provide API/extension points for additional binding 'flavours' (e.g. soap, http, bpel partner-link)</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Provide initial WSDL validator</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsi/M4/milestone_plan.html">wsi</a>] <description>Add JUnit test cases for WSI validation</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsi/M4/milestone_plan.html">wsi</a>] <description>Provide initial WSI compliance extensions for WSDL validation</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                continue refactoring to improve separation of
+                                                components
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                Example Cheat-Sheet XML Editor
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
 <td>[<a href="../../../wst/components/xml/M3/milestone_plan.html">xml</a>] <description>
 						Finish refactoring to improve separation of
 						components
@@ -1672,6 +2566,34 @@
 <td align="center" width="20">
 <img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 </td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>Graphical Table View</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                implement (minimal) DOM Core 3
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                implement DOM Core 3 Validation API
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
 <td>[<a href="../../../wst/components/xml/M3/milestone_plan.html">xml</a>] <description>
 						Investigate Unified Validation marker/annotation
 						model.
@@ -1681,6 +2603,16 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                Unified Validation marker/annotation model.
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/xsd/M3/milestone_plan.html">xsd</a>] <description>Article - Introduction to the XML Schema Editor</description>
@@ -1689,6 +2621,14 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Improve generic support for <i>annotation</i> editing</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
 </td>
 <td>[<a href="../../../wst/components/xsd/M3/milestone_plan.html">xsd</a>] <description>Investigate XSD Editor API requirements</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
@@ -1736,6 +2676,22 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Go into, back-forward history</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../jst/components/j2ee/M4/milestone_plan.html">j2ee</a>] <description>Module artifact editor</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../jst/components/jsp/M3/milestone_plan.html">jsp</a>] <description>
@@ -1762,6 +2718,70 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Clean up API.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Conceal resource preferences more deeply inside the Environment implementation.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Improve development experience around debugging command/command data mappings.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Refactor URI (resource change) transactions out of GUI to non-GUI ECF.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Replace IStructuredSelection by a non-UI equivalent.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Status Handler enhancements including status accumulation and simplified Command execute() API (no statuses returned).</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Support rendering of Java bean inputs and outputs via Status Handler.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/command/M4/milestone_plan.html">command</a>] <description>Support work item counting in Progress Monitor.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/rdb/M3/milestone_plan.html">rdb</a>] <description>Basic content assist</description>
@@ -1778,6 +2798,37 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Improve partitioner's performance.
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Investigate numerous model and document
+						implementation improvements
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Move to latest version of JFlex
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
 </td>
 <td>[<a href="../../../wst/components/wsdl/M3/milestone_plan.html">wsdl</a>] <description>Improve usability of WSDL Editor (ongoing)</description>
@@ -1802,6 +2853,14 @@
 <tr>
 <td/>
 <td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Improve XML Schema editor reliability</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
 <img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
 </td>
 <td>[<a href="../../../wst/components/xsd/M3/milestone_plan.html">xsd</a>] <description>Investigate XSD search function to find component refences in XSD, WSDL and XML</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
@@ -1812,6 +2871,450 @@
 </td>
 </tr>
 </table>
+<table width="100%">
+<tr>
+<td width="100%" bgcolor="#0080c0" height="20">
+<a name="M5"/>
+<b>
+<font color="#ffffff">M5</font>
+</b>
+</td>
+</tr>
+<tr>
+<td/>
+</tr>
+<tr>
+<td>
+<b>Medium Priority</b>
+<ul>
+<table>
+<tr>
+<td colspan="2" width="15">
+<b>jst</b>
+</td>
+<td/>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                allow editing of tag files
+                                        </description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Design and implement how to handle escaping
+                                                characters in Attribute Values (and elsewhere).
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Expression Language (EL) content assist.
+                                        </description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Expression Language (EL) highlighting.
+                                        </description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>JSP Batch validation.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>Sample JET Editor</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>Sample PHP Editor</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+</table>
+<table>
+<tr>
+<td colspan="2" width="15">
+<b>wst</b>
+</td>
+<td/>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/css/M4/milestone_plan.html">css</a>] <description>CSS Validation</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/dtd/M4/milestone_plan.html">dtd</a>] <description>DTD Content Assist</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/dtd/M4/milestone_plan.html">dtd</a>] <description>
+						implement DTD property sheets
+					</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/html/M4/milestone_plan.html">html</a>] <description>
+						refactoring of links in HTML
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Improve "adapt on create" design and
+						implementation.
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Improve "read-only" design
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Improve formatter performance
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Investigate "sparse model" design for memory
+						savings
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Move to new Eclipse base Common Undo Stack
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="13" height="5" src="../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Add JUnit test cases for WSDL model</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>Improve JUnit Coverage</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Article - Introduction to the XML Schema Editor</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Implement visualization of additional objects and relationships</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Improve &lt;import&gt; editing</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Investigate additional API requirements</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Keep history of expansion state to make it more convenient to revisit view</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Provide iniitial XML Schema refactoring support</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Support visualization of additional objects and relationships</description>
+</td>
+</tr>
+</table>
+</ul>
+</td>
+</tr>
+<tr>
+<td>
+<b>Low Priority</b>
+<ul>
+<table>
+<tr>
+<td colspan="2" width="15">
+<b>jst</b>
+</td>
+<td/>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Improve JSP resource use of web.xml file (for
+                                                default encoding and file extensions).
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../jst/components/jsp/M4/milestone_plan.html">jsp</a>] <description>
+                                                Improve re-use of JDT function and preferences
+                                        </description>
+</td>
+</tr>
+</table>
+<table>
+<tr>
+<td colspan="2" width="15">
+<b>wst</b>
+</td>
+<td/>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/css/M4/milestone_plan.html">css</a>] <description>
+						Add "preview" page (or view) as there is for
+						JavaScript Editor.
+					</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Investigate Semantic Highlighting
+					</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/sse/M4/milestone_plan.html">sse</a>] <description>
+						Use Base Spell Checking with Validation
+						Framework
+					</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Improve robustness of schema model synchronization.</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Improve usability of WSDL Editor (ongoing)</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/wsdl/M4/milestone_plan.html">wsdl</a>] <description>Support simplified WSDL Editor view</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                add (non-standard) DOM Operation API.
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                Improve formatting options
+                                        </description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                investigate Content Assist Participant extension point
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xml/M4/milestone_plan.html">xml</a>] <description>
+                                                investigate DOM Event model
+                                        </description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Implement 'Open Declaration' support</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/default.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Improve HTML documention generation</description>
+</td>
+</tr>
+<tr>
+<td/>
+<td align="center" width="20">
+<img width="10" height="10" src="../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td>[<a href="../../../wst/components/xsd/M4/milestone_plan.html">xsd</a>] <description>Investigate XSD search function to find component refences in XSD, WSDL and XML</description>  <img width="40" height="12" src="../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+</tr>
+</table>
+</ul>
+</td>
+</tr>
+</table>
+<table width="100%">
+<tr>
+<td width="100%" bgcolor="#0080c0" height="20">
+<a name="M6-Endgame"/>
+<b>
+<font color="#ffffff">M6-Endgame</font>
+</b>
+</td>
+</tr>
+<tr>
+<td/>
+</tr>
+<tr>
+<td/>
+</tr>
+<tr>
+<td/>
+</tr>
+</table>
 <br/>
 <br/>
 <table border="0" width="100%" cellpadding="2" cellspacing="5">
diff --git a/development/milestone_plans/reports/report-milestone-overview.xml b/development/milestone_plans/reports/report-milestone-overview.xml
index 5262d0d..ec4e875 100644
--- a/development/milestone_plans/reports/report-milestone-overview.xml
+++ b/development/milestone_plans/reports/report-milestone-overview.xml
@@ -9,18 +9,26 @@
 			<contentDescription>Improved XML, JSP and EJB Tools. Database Tools and Initial Web Services. Will be based on 3.1M5.</contentDescription>
 		</milestone>
 		<milestone name="M4">
-			<statusDescription>April 25</statusDescription>
-			<contentDescription>to be determined</contentDescription>
+			<statusDescription>April 22</statusDescription>
+			<contentDescription>WTP 1.0 API Definition Complete. Based on Eclipse 3.1 M6</contentDescription>
+		</milestone>
+		<milestone name="M5">
+			<statusDescription>June 17, 2005</statusDescription>
+			<contentDescription>WTP 1.0 API Implementation Complete. Based on Eclipse 3.1 M7</contentDescription>
+		</milestone>
+		<milestone name="M6-Endgame">
+			<statusDescription>uly 29, 2005</statusDescription>
+			<contentDescription>Stabilization, final bug fixes. Based on Eclipse 3.1 Release</contentDescription>
 		</milestone>
 	</milestoneSummary>
 
 	<plan location="../../../wst/components/css/M3/milestone_plan.xml" />
 	<plan location="../../../wst/components/dtd/M3/milestone_plan.xml" />
 	<plan location="../../../wst/components/html/M3/milestone_plan.xml" />
-	<plan location="../../../wst/components/internet/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/internet/M3/milestone_plan.xml" />
 	<plan location="../../../wst/components/javascript/M3/milestone_plan.xml" />
-	<plan location="../../../wst/components/rdb/M3/milestone_plan.xml" />
-	<plan location="../../../wst/components/server/M4/milestone_plan.xml" />
+    <plan location="../../../wst/components/rdb/M3/milestone_plan.xml" />
+	<plan location="../../../wst/components/server/M3/milestone_plan.xml" />
 	<plan location="../../../wst/components/sse/M3/milestone_plan.xml" />
 	<plan location="../../../wst/components/wsdl/M3/milestone_plan.xml" />
 	<plan location="../../../wst/components/wsi/M3/milestone_plan.xml" />
@@ -29,8 +37,28 @@
 	<plan location="../../../wst/components/ws/M3/milestone_plan.xml"/>
 	<plan location="../../../wst/components/command/M3/milestone_plan.xml"/>
 	<plan location="../../../jst/components/jsp/M3/milestone_plan.xml" />
-	<plan location="../../../jst/components/server/M4/milestone_plan.xml" />
+	<plan location="../../../jst/components/server/M3/milestone_plan.xml" />
     <plan location="../../../jst/components/j2ee/M3/milestone_plan.xml"/>
     <plan location="../../../jst/components/ws/M3/milestone_plan.xml"/>
-    <plan location="../../../jst/components/ws/M4/milestone_plan.xml"/>    
+
+
+	<plan location="../../../wst/components/css/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/dtd/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/html/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/internet/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/javascript/M4/milestone_plan.xml" />
+<!--	<plan location="../../../wst/components/rdb/M4/milestone_plan.xml" /> -->
+	<plan location="../../../wst/components/server/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/sse/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/wsdl/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/wsi/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/xml/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/xsd/M4/milestone_plan.xml" />
+	<plan location="../../../wst/components/ws/M4/milestone_plan.xml"/>
+	<plan location="../../../wst/components/command/M4/milestone_plan.xml"/>
+	<plan location="../../../jst/components/jsp/M4/milestone_plan.xml" />
+	<plan location="../../../jst/components/server/M4/milestone_plan.xml" />
+    <plan location="../../../jst/components/j2ee/M4/milestone_plan.xml"/>
+    <plan location="../../../jst/components/ws/M4/milestone_plan.xml"/>
+    
 </report>
\ No newline at end of file
diff --git a/wst/components/common/M4/milestone_plan.html b/wst/components/common/M4/milestone_plan.html
new file mode 100644
index 0000000..6aaf806
--- /dev/null
+++ b/wst/components/common/M4/milestone_plan.html
@@ -0,0 +1,129 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>common M4 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">common M4</font>
+<br/>
+<font class="indexsub">common component and utilities</font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M4 Plan - under development and review - (updated 2005-03-07)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>content model</b>
+<ul>
+<li><description>Provide simplified API to drive guided editing</description>
+<font color="8080FF"> [high]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>uri resolver</b>
+<ul>
+<li>
+<description>Provide API and extensions points</description>
+<font color="8080FF"> [high]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/css/M3/milestone_plan.html b/wst/components/css/M3/milestone_plan.html
index b5a5412..a1350d6 100644
--- a/wst/components/css/M3/milestone_plan.html
+++ b/wst/components/css/M3/milestone_plan.html
@@ -13,8 +13,8 @@
 <font class="indextop">css M3</font>
 <br/>
 <font class="indexsub">
-			Milestone planning for CSS Core, UI, and Tools
-		</font>
+                        Milestone planning for CSS Core, UI, and Tools
+                </font>
 </td>
 <td>
 <br/>
@@ -31,9 +31,9 @@
 <b>
 <font face="Arial,Helvetica">
 <font color="#ffffff">
-				M3 Plan Status: initial version under development and
-				review - updated 2005-2-24
-			</font>
+                                M3 Plan Status: initial version under development and
+                                review - updated 2005-2-24
+                        </font>
 </font>
 </b>
 </td>
@@ -57,17 +57,17 @@
 <ul>
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/><description>
-						Document Designs, API, and JUnit tests
-					</description>
+                                                Document Designs, API, and JUnit tests
+                                        </description>
 <font color="8080FF"> [high]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> During M3 we'll focus primarily on core (model) Designs and APIs. </detail>&quot;)"/>
 </li>
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						continue refactoring to improve separation of
-						components
-					</description>
+                                                continue refactoring to improve separation of
+                                                components
+                                        </description>
 <font color="8080FF"> [medium]</font>
 </li>
 </ul>
@@ -89,11 +89,10 @@
 <li>
 <img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
 <description>
-						CSS Validation
-					</description>
+                                                CSS Validation
+                                        </description>
 <font color="8080FF"> [medium]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Currently, there's no validation for CSS Syntax, referenced files, etc. We don't have time to do much in this area ... but if someone from community was willing, it would be a nice addition for those that do a lot of CSS work. </detail>&quot;)"/>
-<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
 </li>
 </ul>
 </td>
@@ -153,9 +152,9 @@
 <b>
 <font face="Arial,Helvetica">
 <font color="#ffffff">
-				M4 Plan (initial Rough Draft - last updated 2005-1-11 -
-				to be completed at end of M3)
-			</font>
+                                M4 Plan (initial Rough Draft - last updated 2005-1-11 -
+                                to be completed at end of M3)
+                        </font>
 </font>
 </b>
 </td>
@@ -180,16 +179,16 @@
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						Finish Document Designs, API, and JUnit tests
-					</description>
+                                                Finish Document Designs, API, and JUnit tests
+                                        </description>
 <font color="8080FF"> [high]</font>
 </li>
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						Finish refactoring to improve separation of
-						components
-					</description>
+                                                Finish refactoring to improve separation of
+                                                components
+                                        </description>
 <font color="8080FF"> [medium]</font>
 </li>
 </ul>
diff --git a/wst/components/css/M3/milestone_plan.xml b/wst/components/css/M3/milestone_plan.xml
index 199d553..862a074 100644
--- a/wst/components/css/M3/milestone_plan.xml
+++ b/wst/components/css/M3/milestone_plan.xml
@@ -1,68 +1,68 @@
 <?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
 
 <plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
-	<component name="css" subproject="wst">
-		<description>
-			Milestone planning for CSS Core, UI, and Tools
-		</description>
-		<milestone name="M3">
-			<title>
-				M3 Plan Status: initial version under development and
-				review - updated 2005-2-24
-			</title>
-			<category name="Design for Platform Use">
-				<item priority="high" status="in-progress">
-					<description>
-						Document Designs, API, and JUnit tests
-					</description>
-					<detail>
-						During M3 we'll focus primarily on core (model)
-						Designs and APIs.
-					</detail>
-				</item>
-				<item priority="medium" status="in-progress">
-					<description>
-						continue refactoring to improve separation of
-						components
-					</description>
-				</item>
-			</category>
-			<category name="Eclipse Base Parity">
-				<item priority="medium" status="deferred" helpWanted="true">
-					<description>
-						CSS Validation
-					</description>
-					<detail>
-						Currently, there's no validation for CSS Syntax,
-						referenced files, etc. We don't have time to do
-						much in this area ... but if someone from
-						community was willing, it would be a nice
-						addition for those that do a lot of CSS work.
-					</detail>
-				</item>
-			</category>
-		</milestone>
-		<milestone name="M4">
-			<title>
-				M4 Plan (initial Rough Draft - last updated 2005-1-11 -
-				to be completed at end of M3)
-			</title>
-			<category name="Design for Platform Use">
-				<item priority="high" status="in-progress">
-					<description>
-						Finish Document Designs, API, and JUnit tests
-					</description>
-				</item>
-				<item priority="medium" status="in-progress">
-					<description>
-						Finish refactoring to improve separation of
-						components
-					</description>
-				</item>
-			</category>
-		</milestone>
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="css" subproject="wst">
+                <description>
+                        Milestone planning for CSS Core, UI, and Tools
+                </description>
+                <milestone name="M3">
+                        <title>
+                                M3 Plan Status: initial version under development and
+                                review - updated 2005-2-24
+                        </title>
+                        <category name="Design for Platform Use">
+                                <item priority="high" status="in-progress">
+                                        <description>
+                                                Document Designs, API, and JUnit tests
+                                        </description>
+                                        <detail>
+                                                During M3 we'll focus primarily on core (model)
+                                                Designs and APIs.
+                                        </detail>
+                                </item>
+                                <item priority="medium" status="in-progress">
+                                        <description>
+                                                continue refactoring to improve separation of
+                                                components
+                                        </description>
+                                </item>
+                        </category>
+                        <category name="Eclipse Base Parity">
+                                <item priority="medium" status="deferred">
+                                        <description>
+                                                CSS Validation
+                                        </description>
+                                        <detail>
+                                                Currently, there's no validation for CSS Syntax,
+                                                referenced files, etc. We don't have time to do
+                                                much in this area ... but if someone from
+                                                community was willing, it would be a nice
+                                                addition for those that do a lot of CSS work.
+                                        </detail>
+                                </item>
+                        </category>
+                </milestone>
+                <milestone name="M4">
+                        <title>
+                                M4 Plan (initial Rough Draft - last updated 2005-1-11 -
+                                to be completed at end of M3)
+                        </title>
+                        <category name="Design for Platform Use">
+                                <item priority="high" status="in-progress">
+                                        <description>
+                                                Finish Document Designs, API, and JUnit tests
+                                        </description>
+                                </item>
+                                <item priority="medium" status="in-progress">
+                                        <description>
+                                                Finish refactoring to improve separation of
+                                                components
+                                        </description>
+                                </item>
+                        </category>
+                </milestone>
 
 
-	</component>
+        </component>
 </plan>
\ No newline at end of file
diff --git a/wst/components/css/M5/milestone_plan.html b/wst/components/css/M5/milestone_plan.html
new file mode 100644
index 0000000..0c1f1c3
--- /dev/null
+++ b/wst/components/css/M5/milestone_plan.html
@@ -0,0 +1,138 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>css M5 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">css M5</font>
+<br/>
+<font class="indexsub">
+                        Milestone planning for CSS Core, UI, and Tools
+                </font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M5 Plan (initial Rough Draft)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Eclipse Base Parity</b>
+<ul>
+<li><description>CSS Validation</description>
+<font color="8080FF"> [medium]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Currently, there's no validation for CSS Syntax, referenced files, etc. We don't have time to do much in this area ... but if someone from community was willing, it would be a nice addition for those that do a lot of CSS work. </detail>&quot;)"/>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WTP Integration</b>
+<ul>
+<li>
+<description>
+                                                Add "preview" page (or view) as there is for
+                                                JavaScript Editor.
+                                        </description>
+<font color="8080FF"> [low]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> We might provide one standard example HTML file, but users would need ability to specify their own HTML file to use in the preview. </detail>&quot;)"/>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/css/M5/milestone_plan.xml b/wst/components/css/M5/milestone_plan.xml
new file mode 100644
index 0000000..dfc833c
--- /dev/null
+++ b/wst/components/css/M5/milestone_plan.xml
@@ -0,0 +1,41 @@
+<?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
+
+<plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="css" subproject="wst">
+                <description>
+                        Milestone planning for CSS Core, UI, and Tools
+                </description>
+                <milestone name="M5">
+                        <title>M5 Plan (initial Rough Draft)</title>
+                        <category name="Eclipse Base Parity">
+                                <item priority="medium" status="time-permitted"
+                                        helpWanted="true">
+                                        <description>CSS Validation</description>
+                                        <detail>
+                                                Currently, there's no validation for CSS Syntax,
+                                                referenced files, etc. We don't have time to do
+                                                much in this area ... but if someone from
+                                                community was willing, it would be a nice
+                                                addition for those that do a lot of CSS work.
+                                        </detail>
+                                </item>
+                        </category>
+                        <category name="WTP Integration">
+                                <item priority="low" status="new" helpWanted="true">
+                                        <description>
+                                                Add "preview" page (or view) as there is for
+                                                JavaScript Editor.
+                                        </description>
+                                        <detail>
+                                                We might provide one standard example HTML file,
+                                                but users would need ability to specify their
+                                                own HTML file to use in the preview.
+                                        </detail>
+                                </item>
+                        </category>
+                </milestone>
+
+
+        </component>
+</plan>
\ No newline at end of file
diff --git a/wst/components/dtd/M5/milestone_plan.html b/wst/components/dtd/M5/milestone_plan.html
new file mode 100644
index 0000000..fd36092
--- /dev/null
+++ b/wst/components/dtd/M5/milestone_plan.html
@@ -0,0 +1,120 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>dtd M5 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">dtd M5</font>
+<br/>
+<font class="indexsub">
+                        Milestone planning for DTD Core, UI, and Tools
+                </font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M5 Plan (initial Rough Draft)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Eclipse Base Parity</b>
+<ul>
+<li><description>DTD Content Assist</description>
+<font color="8080FF"> [medium]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Currently, there's no content assist for DTD editing. We don't have time to do much in this area ... but if someone from community was willing, it would be a nice addition for those that do a lot of DTD work. </detail>&quot;)"/>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<li>
+<description>
+                                                implement DTD property sheets
+                                        </description>
+<font color="8080FF"> [medium]</font>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/dtd/M5/milestone_plan.xml b/wst/components/dtd/M5/milestone_plan.xml
new file mode 100644
index 0000000..eb0c0fd
--- /dev/null
+++ b/wst/components/dtd/M5/milestone_plan.xml
@@ -0,0 +1,31 @@
+<?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
+
+<plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="dtd" subproject="wst">
+                <description>
+                        Milestone planning for DTD Core, UI, and Tools
+                </description>
+                <milestone name="M5">
+                        <title>M5 Plan (initial Rough Draft)</title>
+                        <category name="Eclipse Base Parity">
+                                <item priority="medium" helpWanted="true">
+                                        <description>DTD Content Assist</description>
+                                        <detail>
+                                                Currently, there's no content assist for DTD
+                                                editing. We don't have time to do much in this
+                                                area ... but if someone from community was
+                                                willing, it would be a nice addition for those
+                                                that do a lot of DTD work.
+                                        </detail>
+                                </item>
+                                <item priority="medium" status="new"
+                                        helpWanted="true">
+                                        <description>
+                                                implement DTD property sheets
+                                        </description>
+                                </item>
+                        </category>
+                </milestone>
+        </component>
+</plan>
\ No newline at end of file
diff --git a/wst/components/html/M5/milestone_plan.html b/wst/components/html/M5/milestone_plan.html
new file mode 100644
index 0000000..1cf4c46
--- /dev/null
+++ b/wst/components/html/M5/milestone_plan.html
@@ -0,0 +1,113 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>html M5 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">html M5</font>
+<br/>
+<font class="indexsub">
+                        Milestone planning for HTML Core, UI, and Tools
+                </font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M5 Plan (initial Rough Draft)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Eclipse Base Parity</b>
+<ul>
+<li><description>
+                                                refactoring of links in HTML
+                                        </description>
+<font color="8080FF"> [medium]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/html/M5/milestone_plan.xml b/wst/components/html/M5/milestone_plan.xml
new file mode 100644
index 0000000..9981983
--- /dev/null
+++ b/wst/components/html/M5/milestone_plan.xml
@@ -0,0 +1,21 @@
+<?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
+
+<plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="html" subproject="wst">
+                <description>
+                        Milestone planning for HTML Core, UI, and Tools
+                </description>
+                <milestone name="M5">
+                        <title>M5 Plan (initial Rough Draft)</title>
+                        <category name="Eclipse Base Parity">
+                                <item priority="medium">
+                                        <description>
+                                                refactoring of links in HTML
+                                        </description>
+                                        <developer name="pavery@us.ibm.com" />
+                                </item>
+                        </category>
+                </milestone>
+        </component>
+</plan>
\ No newline at end of file
diff --git a/wst/components/internet/M3/milestone_plan.html b/wst/components/internet/M3/milestone_plan.html
index e305203..c80dc10 100644
--- a/wst/components/internet/M3/milestone_plan.html
+++ b/wst/components/internet/M3/milestone_plan.html
@@ -1,4 +1,4 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xalan="http://xml.apache.org/xslt">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <head>
 <title>internet M3 milestone plan</title>
 <link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
@@ -51,8 +51,7 @@
 <b>API Stability</b>
 <ul>
 <li>
-<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
-<description>Web browser and TCP/IP monitor API cleanup and improvement</description>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/><description>Web browser and TCP/IP monitor API cleanup and improvement</description>
 <font color="8080FF"> [high]</font>
 </li>
 <ul>
diff --git a/wst/components/javascript/M5/milestone_plan.html b/wst/components/javascript/M5/milestone_plan.html
new file mode 100644
index 0000000..04cd602
--- /dev/null
+++ b/wst/components/javascript/M5/milestone_plan.html
@@ -0,0 +1,114 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>javascript M5 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">javascript M5</font>
+<br/>
+<font class="indexsub">
+                        Milestone planning for JavaScript Core, UI, and Tools
+                </font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M5 Plan</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Misc</b>
+<ul>
+<li>
+<img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/><description>
+                                                Bug fixes, improve junit coverage.
+                                        </description>
+<font color="8080FF"> [high]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/javascript/M5/milestone_plan.xml b/wst/components/javascript/M5/milestone_plan.xml
new file mode 100644
index 0000000..7b4247d
--- /dev/null
+++ b/wst/components/javascript/M5/milestone_plan.xml
@@ -0,0 +1,20 @@
+<?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
+
+<plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="javascript" subproject="wst">
+                <description>
+                        Milestone planning for JavaScript Core, UI, and Tools
+                </description>
+                <milestone name="M5">
+                        <title>M5 Plan</title>
+                        <category name="Misc">
+                                <item priority="high" status="in-progress">
+                                        <description>
+                                                Bug fixes, improve junit coverage.
+                                        </description>
+                                        </item>
+                        </category>
+                </milestone>
+        </component>
+</plan>
\ No newline at end of file
diff --git a/wst/components/server/M3/milestone_plan.html b/wst/components/server/M3/milestone_plan.html
index 4f2b774..1bd781c 100644
--- a/wst/components/server/M3/milestone_plan.html
+++ b/wst/components/server/M3/milestone_plan.html
@@ -1,4 +1,4 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xalan="http://xml.apache.org/xslt">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 <head>
 <title>server M3 milestone plan</title>
 <link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
@@ -51,8 +51,7 @@
 <b>API Stability</b>
 <ul>
 <li>
-<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
-<description>API cleanup and improvement</description>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/><description>API cleanup and improvement</description>
 <font color="8080FF"> [high]</font>
 </li>
 <ul>
diff --git a/wst/components/sse/M5/milestone_plan.html b/wst/components/sse/M5/milestone_plan.html
new file mode 100644
index 0000000..4785668
--- /dev/null
+++ b/wst/components/sse/M5/milestone_plan.html
@@ -0,0 +1,190 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>sse M5 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">sse M5</font>
+<br/>
+<font class="indexsub">
+                        Milestone planning for SSE Core, UI, and Tools
+                </font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M5 Plan (initial Rough Draft)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>New Features</b>
+<ul>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/><description>
+                                                Use Base Spell Checking with Validation
+                                                Framework
+                                        </description>
+<font color="8080FF"> [low]</font>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>
+                                                Investigate Semantic Highlighting
+                                        </description>
+<font color="8080FF"> [low]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> This may take some experimenting to find best solution to do both syntax highlighting (using line event callback) and semantic highlighting based on DOM (using presentation reconciler). </detail>&quot;)"/>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Eclipse base parity</b>
+<ul>
+<li>
+<description>
+                                                Move to new Eclipse base Common Undo Stack
+                                        </description>
+<font color="8080FF"> [medium]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Performance</b>
+<ul>
+<li>
+<description>
+                                                Improve "adapt on create" design and
+                                                implementation.
+                                        </description>
+<font color="8080FF"> [medium]</font>
+</li>
+<li>
+<description>
+                                                Improve "read-only" design
+                                        </description>
+<font color="8080FF"> [medium]</font>
+</li>
+<li>
+<description>
+                                                Improve formatter performance
+                                        </description>
+<font color="8080FF"> [medium]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> We believe the main problem is excessive notifications for formatting large areas of text. We should be able to know that formatting is happening, and perform all edits at once with minimal notifications of elements changing, especially since it's 'only' whitespace being changed. </detail>&quot;)"/>
+</li>
+<li>
+<description>
+                                                Investigate "sparse model" design for memory
+                                                savings
+                                        </description>
+<font color="8080FF"> [medium]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> A possible improvement may be to perform a 'coarse' parsing the first time though. That is, only parse StructurdDocumentRegions, then only provide finer details of those regions upon request. This is more along the lines of 'pay as you go', which seems to be the overall direction of Eclipse. </detail>&quot;)"/>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/sse/M5/milestone_plan.xml b/wst/components/sse/M5/milestone_plan.xml
new file mode 100644
index 0000000..5538f3f
--- /dev/null
+++ b/wst/components/sse/M5/milestone_plan.xml
@@ -0,0 +1,83 @@
+<?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
+
+<plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="sse" subproject="wst">
+                <description>
+                        Milestone planning for SSE Core, UI, and Tools
+                </description>
+                <milestone name="M5">
+                        <title>M5 Plan (initial Rough Draft)</title>
+                        <category name="New Features">
+                                <item priority="low" status="investigate"
+                                        helpWanted="true">
+                                        <description>
+                                                Use Base Spell Checking with Validation
+                                                Framework
+                                        </description>
+                                </item>
+                                <item priority="low" status="investigate">
+                                        <description>
+                                                Investigate Semantic Highlighting
+                                        </description>
+                                        <detail>
+                                                This may take some experimenting to find best
+                                                solution to do both syntax highlighting (using
+                                                line event callback) and semantic highlighting
+                                                based on DOM (using presentation reconciler).
+                                        </detail>
+                                </item>
+                        </category>
+                        <category name="Eclipse base parity">
+                                <item priority="medium">
+                                        <description>
+                                                Move to new Eclipse base Common Undo Stack
+                                        </description>
+                                </item>
+                        </category>
+                        <category name="Performance">
+                                <item priority="medium">
+                                        <description>
+                                                Improve "adapt on create" design and
+                                                implementation.
+                                        </description>
+                                </item>
+                                <item priority="medium">
+                                        <description>
+                                                Improve "read-only" design
+                                        </description>
+                                </item>
+                                <item priority="medium">
+                                        <description>
+                                                Improve formatter performance
+                                        </description>
+                                        <detail>
+                                                We believe the main problem is excessive
+                                                notifications for formatting large areas of
+                                                text. We should be able to know that formatting
+                                                is happening, and perform all edits at once with
+                                                minimal notifications of elements changing,
+                                                especially since it's "only" whitespace being
+                                                changed.
+                                        </detail>
+                                </item>
+                                <item priority="medium">
+                                        <description>
+                                                Investigate "sparse model" design for memory
+                                                savings
+                                        </description>
+                                        <detail>
+                                                A possible improvement may be to perform a
+                                                "coarse" parsing the first time though. That is,
+                                                only parse StructurdDocumentRegions, then only
+                                                provide finer details of those regions upon
+                                                request. This is more along the lines of "pay as
+                                                you go", which seems to be the overall direction
+                                                of Eclipse.
+                                        </detail>
+                                </item>
+                        </category>
+                </milestone>
+
+        </component>
+</plan>
\ No newline at end of file
diff --git a/wst/components/wsdl/M4/milestone_plan.html b/wst/components/wsdl/M4/milestone_plan.html
new file mode 100644
index 0000000..dd330b9
--- /dev/null
+++ b/wst/components/wsdl/M4/milestone_plan.html
@@ -0,0 +1,326 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>wsdl M4 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">wsdl M4</font>
+<br/>
+<font class="indexsub">web service description language tools</font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M4 Plan - under development and review - (updated 2005-03-07)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WSDL UI</b>
+<ul>
+<li><description>Provide API/extension points for extensibility element support in UI (<i>investigate push down to xml.ui</i>)</description>
+<font color="8080FF"> [high]</font>
+</li>
+<ul>
+<li>
+<description>customized icons</description>
+</li>
+<li>
+<description>customized cell editors</description>
+</li>
+<li>
+<description>guided editing filters (to narrow suggestions for 'any' elements)</description>
+</li>
+</ul>
+<li>
+<description>Provide API/extension points for additional binding 'flavours' (e.g. soap, http, bpel partner-link)</description>
+<font color="8080FF"> [medium]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WSDL Model</b>
+<ul>
+<li>
+<description>Provide WSDL model API</description>
+<font color="8080FF"> [high]</font>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<li>
+<description>Provide API/extension point for extensibility element models</description>
+<font color="8080FF"> [high]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WSDL Validation</b>
+<ul>
+<li>
+<description>Provide initial WSDL validator</description>
+<font color="8080FF"> [medium]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Future Plans (Rough Draft - updated 2005-03-07)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td>
+<description>Subject to change</description>
+</td>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WSDL UI</b>
+<ul>
+<li>
+<description>Support simplified WSDL Editor view</description>
+<font color="8080FF"> [low]</font>
+</li>
+<ul>
+<li>
+<description>Automatically update bindings when interfaces are edited</description>
+</li>
+<li>
+<description>Support show/hide of message group</description>
+</li>
+<li>
+<description>Provide properties sheet tab to edit binding from interface (enable binding view to be hidden)</description>
+</li>
+</ul>
+<li>
+<description>Improve robustness of schema model synchronization.</description>
+<font color="8080FF"> [low]</font>
+</li>
+<ul>
+<li>
+<description>Write Junit test cases to test synchronization</description>
+</li>
+<li>
+<description>Investigate 'full synchronize on timed interval' approach.</description>
+</li>
+</ul>
+<li>
+<description>Improve usability of WSDL Editor (ongoing)</description>
+</li>
+<ul>
+<li>
+<description>Allow sections to be resizable</description>
+</li>
+</ul>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>Investigate editor support for WSDL 2.0 model</description>
+</li>
+<li>
+<description>Improve usability of WSDL Editor (ongoing)</description>
+<font color="8080FF"> [low]</font>
+</li>
+<ul>
+<li>
+<description>Show 'wsi' imports more clearly in the 'Types' section</description>
+</li>
+<li>
+<description>Preserve WSDL graph view's tree expansion state when drilling down/back</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WSDL Model</b>
+<ul>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>Investigate WSDL 2.0 model</description>
+</li>
+<li>
+<img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+<description>Add JUnit test cases for WSDL model</description>
+<font color="8080FF"> [medium]</font>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<ul>
+<li>
+<description>Load update and save a WSDL model</description>
+</li>
+<li>
+<description>Dump a 'semantic' representation of the model (tests walking component refs etc.)</description>
+</li>
+<li>
+<description>Load update model utlizing XML catalog</description>
+</li>
+<li>
+<description>Exercise wsdl extension models (SOAP, HTTP, XSD etc.)</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WSDL Documentation Generation</b>
+<ul>
+<li>
+<description>Improve HTML documention generation</description>
+</li>
+<ul>
+<li>
+<description>Provide basic documentation generation support</description>
+</li>
+<li>
+<description>Refactor for reuse (e.g. so WSDL docgen links seamlessly with XSD docgen)</description>
+</li>
+<li>
+<description>Support &lt;documentation&gt; content in gen'd docs</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<br/>
+</body>
+</html>
diff --git a/wst/components/wsi/M4/milestone_plan.html b/wst/components/wsi/M4/milestone_plan.html
new file mode 100644
index 0000000..e3f0017
--- /dev/null
+++ b/wst/components/wsi/M4/milestone_plan.html
@@ -0,0 +1,113 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>wsi M4 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">wsi M4</font>
+<br/>
+<font class="indexsub">web service description language tools</font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M4 Plan - under development and review - (updated 2005-03-07)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>WSI Validation</b>
+<ul>
+<li><description>Provide initial WSI compliance extensions for WSDL validation</description>
+<font color="8080FF"> [medium]</font>
+</li>
+<li>
+<description>Add JUnit test cases for WSI validation</description>
+<font color="8080FF"> [medium]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/xml/M4/milestone_plan.html b/wst/components/xml/M4/milestone_plan.html
index 53124cf..1ea933d 100644
--- a/wst/components/xml/M4/milestone_plan.html
+++ b/wst/components/xml/M4/milestone_plan.html
@@ -13,8 +13,8 @@
 <font class="indextop">xml M4</font>
 <br/>
 <font class="indexsub">
-			Milestone planning for XML Core, UI, and Tools
-		</font>
+                        Milestone planning for XML Core, UI, and Tools
+                </font>
 </td>
 <td>
 <br/>
@@ -54,18 +54,18 @@
 <ul>
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/><description>
-						Document Designs, API, JUnit tests, and
-						Performance Tests
-					</description>
+                                                Document Designs, API, JUnit tests, and
+                                                Performance Tests
+                                        </description>
 <font color="8080FF"> [high]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Describe not only 'standard' DOM APIs we support, but also, the extensions to that API, include Adapters and ReadOnly APIs. </detail>&quot;)"/>
 </li>
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						continue refactoring to improve separation of
-						components
-					</description>
+                                                continue refactoring to improve separation of
+                                                components
+                                        </description>
 <font color="8080FF"> [medium]</font>
 </li>
 </ul>
@@ -87,8 +87,8 @@
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						Unified Validation marker/annotation model.
-					</description>
+                                                Unified Validation marker/annotation model.
+                                        </description>
 <font color="8080FF"> [medium]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Need to finish work started in M3, namely use grey icons, and integrate as extension participant. </detail>&quot;)"/>
 </li>
@@ -111,16 +111,16 @@
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						implement (minimal) DOM Core 3
-					</description>
+                                                implement (minimal) DOM Core 3
+                                        </description>
 <font color="8080FF"> [medium]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Some intend to use our code with JDK 1.5. While we don't claim to support full compliance with 1.5 (or with DOM Core 3 APIs), this is an area than may cause -verify errors even if 1.5 runs a 1.4 library. </detail>&quot;)"/>
 </li>
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						implement DOM Core 3 Validation API
-					</description>
+                                                implement DOM Core 3 Validation API
+                                        </description>
 <font color="8080FF"> [medium]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Four DOM API's will be the public side of our validate content APIs. (Current, complex content model classes/methods will be 'internal'). </detail>&quot;)"/>
 </li>
@@ -132,8 +132,8 @@
 <li>
 <img width="13" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
 <description>
-						Example Cheat-Sheet XML Editor
-					</description>
+                                                Example Cheat-Sheet XML Editor
+                                        </description>
 <font color="8080FF"> [medium]</font>
 </li>
 </ul>
@@ -224,11 +224,25 @@
 <li>
 <img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
 <description>
-						add (non-standard) DOM Operation API.
-					</description>
+                                                add (non-standard) DOM Operation API.
+                                        </description>
 <font color="8080FF"> [low]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Its purpose is to optimize notifications, undo 'units', and also handle such things as auto-formatting for all clients. </detail>&quot;)"/>
 </li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>
+                                                investigate DOM Event model
+                                        </description>
+<font color="8080FF"> [low]</font>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>
+                                                investigate Content Assist Participant extension point
+                                        </description>
+<font color="8080FF"> [low]</font>
+</li>
 </ul>
 </td>
 </tr>
@@ -248,8 +262,8 @@
 <li>
 <img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
 <description>
-						Improve formatting options
-					</description>
+                                                Improve formatting options
+                                        </description>
 <font color="8080FF"> [low]</font>
 <img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> The Eclipse Java Formatter has approximately 129 formatting options. I'm not sure we can beat that record, but we should at least investigate the possiblity. :) </detail>&quot;)"/>
 <img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
diff --git a/wst/components/xml/M4/milestone_plan.xml b/wst/components/xml/M4/milestone_plan.xml
index ff290eb..631625e 100644
--- a/wst/components/xml/M4/milestone_plan.xml
+++ b/wst/components/xml/M4/milestone_plan.xml
@@ -1,116 +1,126 @@
 <?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
 
 <plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
-	<component name="xml" subproject="wst">
-		<description>
-			Milestone planning for XML Core, UI, and Tools
-		</description>
-		<milestone name="M4">
-			<title>M4 Plan</title>
-			<category name="Design for Platform Use">
-				<item priority="high" status="in-progress">
-					<description>
-						Document Designs, API, JUnit tests, and
-						Performance Tests
-					</description>
-					<detail>
-						Describe not only "standard" DOM APIs we
-						support, but also, the extensions to that API,
-						include Adapters and ReadOnly APIs.
-					</detail>
-				</item>
-				<item priority="medium" status="in-progress">
-					<description>
-						continue refactoring to improve separation of
-						components
-					</description>
-				</item>
-			</category>
-			<category name="Eclipse base parity">
-				<item priority="medium" status="in-progress">
-					<description>
-						Unified Validation marker/annotation model.
-					</description>
-					<detail>
-						Need to finish work started in M3, namely use
-						grey icons, and integrate as extension
-						participant.
-					</detail>
-				</item>
-			</category>
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="xml" subproject="wst">
+                <description>
+                        Milestone planning for XML Core, UI, and Tools
+                </description>
+                <milestone name="M4">
+                        <title>M4 Plan</title>
+                        <category name="Design for Platform Use">
+                                <item priority="high" status="in-progress">
+                                        <description>
+                                                Document Designs, API, JUnit tests, and
+                                                Performance Tests
+                                        </description>
+                                        <detail>
+                                                Describe not only "standard" DOM APIs we
+                                                support, but also, the extensions to that API,
+                                                include Adapters and ReadOnly APIs.
+                                        </detail>
+                                </item>
+                                <item priority="medium" status="in-progress">
+                                        <description>
+                                                continue refactoring to improve separation of
+                                                components
+                                        </description>
+                                </item>
+                        </category>
+                        <category name="Eclipse base parity">
+                                <item priority="medium" status="in-progress">
+                                        <description>
+                                                Unified Validation marker/annotation model.
+                                        </description>
+                                        <detail>
+                                                Need to finish work started in M3, namely use
+                                                grey icons, and integrate as extension
+                                                participant.
+                                        </detail>
+                                </item>
+                        </category>
 
-			<category name="Misc. Items">
-				<item priority="medium" status="in-progress">
-					<description>
-						implement (minimal) DOM Core 3
-					</description>
-					<detail>
-						Some intend to use our code with JDK 1.5. While
-						we don't claim to support full compliance with
-						1.5 (or with DOM Core 3 APIs), this is an area
-						than may cause -verify errors even if 1.5 runs a
-						1.4 library.
-					</detail>
-				</item>
-				<item priority="medium" status="in-progress">
-					<description>
-						implement DOM Core 3 Validation API
-					</description>
-					<detail>
-						Four DOM API's will be the public side of our
-						validate content APIs. (Current, complex content
-						model classes/methods will be 'internal').
-					</detail>
-				</item>
-				<item priority="medium" status="in-progress">
-					<description>Graphical Table View</description>
-				</item>
-				<item priority="medium" status="in-progress">
-					<description>
-						Example Cheat-Sheet XML Editor
-					</description>
-				</item>
-			</category>
-		</milestone>
-		<milestone name="M5">
-			<title>M5 Plan (initial Rough Draft)</title>
-			<category name="Design for Platform Use">
-				<item priority="medium" status="new"
-					helpWanted="true">
-					<description>Improve JUnit Coverage</description>
-					<detail>
-						Seems there must be thousands of (public) XML
-						Parsing examples we should test and make sure we
-						parse the same way as other parsers, such as
-						Xerces, when well formed.
-					</detail>
-				</item>
-				<item priority="low" status="investigate">
-					<description>
-						add (non-standard) DOM Operation API.
-					</description>
-					<detail>
-						Its purpose is to optimize notifications, undo
-						"units", and also handle such things as
-						auto-formatting for all clients.
-					</detail>
-				</item>
-			</category>
-			<category name="Eclipse base parity">
-				<item priority="low" status="investigate"
-					helpWanted="true">
-					<description>
-						Improve formatting options
-					</description>
-					<detail>
-						The Eclipse Java Formatter has approximately 129
-						formatting options. I'm not sure we can beat
-						that record, but we should at least investigate
-						the possiblity. :)
-					</detail>
-				</item>
-			</category>
-		</milestone>
-	</component>
+                        <category name="Misc. Items">
+                                <item priority="medium" status="in-progress">
+                                        <description>
+                                                implement (minimal) DOM Core 3
+                                        </description>
+                                        <detail>
+                                                Some intend to use our code with JDK 1.5. While
+                                                we don't claim to support full compliance with
+                                                1.5 (or with DOM Core 3 APIs), this is an area
+                                                than may cause -verify errors even if 1.5 runs a
+                                                1.4 library.
+                                        </detail>
+                                </item>
+                                <item priority="medium" status="in-progress">
+                                        <description>
+                                                implement DOM Core 3 Validation API
+                                        </description>
+                                        <detail>
+                                                Four DOM API's will be the public side of our
+                                                validate content APIs. (Current, complex content
+                                                model classes/methods will be 'internal').
+                                        </detail>
+                                </item>
+                                <item priority="medium" status="in-progress">
+                                        <description>Graphical Table View</description>
+                                </item>
+                                <item priority="medium" status="in-progress">
+                                        <description>
+                                                Example Cheat-Sheet XML Editor
+                                        </description>
+                                </item>
+                        </category>
+                </milestone>
+                <milestone name="M5">
+                        <title>M5 Plan (initial Rough Draft)</title>
+                        <category name="Design for Platform Use">
+                                <item priority="medium" status="new"
+                                        helpWanted="true">
+                                        <description>Improve JUnit Coverage</description>
+                                        <detail>
+                                                Seems there must be thousands of (public) XML
+                                                Parsing examples we should test and make sure we
+                                                parse the same way as other parsers, such as
+                                                Xerces, when well formed.
+                                        </detail>
+                                </item>
+                                <item priority="low" status="investigate">
+                                        <description>
+                                                add (non-standard) DOM Operation API.
+                                        </description>
+                                        <detail>
+                                                Its purpose is to optimize notifications, undo
+                                                "units", and also handle such things as
+                                                auto-formatting for all clients.
+                                        </detail>
+                                </item>
+                                <item priority="low" status="investigate">
+                                        <description>
+                                                investigate DOM Event model
+                                        </description>
+                                </item>
+                                <item priority="low" status="investigate">
+                                        <description>
+                                                investigate Content Assist Participant extension point
+                                        </description>
+                                </item>
+                        </category>
+                        <category name="Eclipse base parity">
+                                <item priority="low" status="investigate"
+                                        helpWanted="true">
+                                        <description>
+                                                Improve formatting options
+                                        </description>
+                                        <detail>
+                                                The Eclipse Java Formatter has approximately 129
+                                                formatting options. I'm not sure we can beat
+                                                that record, but we should at least investigate
+                                                the possiblity. :)
+                                        </detail>
+                                </item>
+                        </category>
+                </milestone>
+        </component>
 </plan>
\ No newline at end of file
diff --git a/wst/components/xml/M5/milestone_plan.html b/wst/components/xml/M5/milestone_plan.html
new file mode 100644
index 0000000..9673374
--- /dev/null
+++ b/wst/components/xml/M5/milestone_plan.html
@@ -0,0 +1,160 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>xml M5 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">xml M5</font>
+<br/>
+<font class="indexsub">
+                        Milestone planning for XML Core, UI, and Tools
+                </font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M5 Plan (initial Rough Draft)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Design for Platform Use</b>
+<ul>
+<li><description>Improve JUnit Coverage</description>
+<font color="8080FF"> [medium]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Seems there must be thousands of (public) XML Parsing examples we should test and make sure we parse the same way as other parsers, such as Xerces, when well formed. </detail>&quot;)"/>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>
+                                                add (non-standard) DOM Operation API.
+                                        </description>
+<font color="8080FF"> [low]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Its purpose is to optimize notifications, undo 'units', and also handle such things as auto-formatting for all clients. </detail>&quot;)"/>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>
+                                                investigate DOM Event model
+                                        </description>
+<font color="8080FF"> [low]</font>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>
+                                                investigate Content Assist Participant extension point
+                                        </description>
+<font color="8080FF"> [low]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Eclipse base parity</b>
+<ul>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>
+                                                Improve formatting options
+                                        </description>
+<font color="8080FF"> [low]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> The Eclipse Java Formatter has approximately 129 formatting options. I'm not sure we can beat that record, but we should at least investigate the possiblity. :) </detail>&quot;)"/>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<br/>
+</body>
+</html>
diff --git a/wst/components/xml/M5/milestone_plan.xml b/wst/components/xml/M5/milestone_plan.xml
new file mode 100644
index 0000000..e197be1
--- /dev/null
+++ b/wst/components/xml/M5/milestone_plan.xml
@@ -0,0 +1,59 @@
+<?xml-stylesheet type="text/xsl" href="../../../../development/milestone_plans/stylesheets/milestone-bulletList.xsl"?>
+
+<plan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../development/milestone_plans/milestonePlan.xsd">
+        <component name="xml" subproject="wst">
+                <description>
+                        Milestone planning for XML Core, UI, and Tools
+                </description>
+                <milestone name="M5">
+                        <title>M5 Plan (initial Rough Draft)</title>
+                        <category name="Design for Platform Use">
+                                <item priority="medium" status="new"
+                                        helpWanted="true">
+                                        <description>Improve JUnit Coverage</description>
+                                        <detail>
+                                                Seems there must be thousands of (public) XML
+                                                Parsing examples we should test and make sure we
+                                                parse the same way as other parsers, such as
+                                                Xerces, when well formed.
+                                        </detail>
+                                </item>
+                                <item priority="low" status="investigate">
+                                        <description>
+                                                add (non-standard) DOM Operation API.
+                                        </description>
+                                        <detail>
+                                                Its purpose is to optimize notifications, undo
+                                                "units", and also handle such things as
+                                                auto-formatting for all clients.
+                                        </detail>
+                                </item>
+                                <item priority="low" status="investigate">
+                                        <description>
+                                                investigate DOM Event model
+                                        </description>
+                                </item>
+                                <item priority="low" status="investigate">
+                                        <description>
+                                                investigate Content Assist Participant extension point
+                                        </description>
+                                </item>
+                        </category>
+                        <category name="Eclipse base parity">
+                                <item priority="low" status="investigate"
+                                        helpWanted="true">
+                                        <description>
+                                                Improve formatting options
+                                        </description>
+                                        <detail>
+                                                The Eclipse Java Formatter has approximately 129
+                                                formatting options. I'm not sure we can beat
+                                                that record, but we should at least investigate
+                                                the possiblity. :)
+                                        </detail>
+                                </item>
+                        </category>
+                </milestone>
+        </component>
+</plan>
\ No newline at end of file
diff --git a/wst/components/xsd/M4/milestone_plan.html b/wst/components/xsd/M4/milestone_plan.html
new file mode 100644
index 0000000..0bad658
--- /dev/null
+++ b/wst/components/xsd/M4/milestone_plan.html
@@ -0,0 +1,340 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<head>
+<title>xsd M4 milestone plan</title>
+<link rel="stylesheet" type="text/css" href="../../../../development/milestone_plans/stylesheets/images/default_style.css"/>
+<script src="../../../../popup.js" type="text/javascript">
+					// script is linked
+				</script>
+</head>
+<body>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<td>
+<font class="indextop">xsd M4</font>
+<br/>
+<font class="indexsub">xml schema tools</font>
+</td>
+<td>
+<br/>
+</td>
+<td width="28%">
+<img height="86" width="120" src="../../../../development/milestone_plans/stylesheets/images/Idea.jpe"/>
+</td>
+</tr>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">M4 Plan - under development and review - (updated 2005-03-07)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Overall XSD UI</b>
+<ul>
+<li><description>Support API for contributing menu items to graph and outline views</description>
+<font color="8080FF"> [high]</font>
+</li>
+<li>
+<description>Improve XML Schema editor reliability</description>
+<font color="8080FF"> [low]</font>
+<img width="16" height="15" src="../../../../development/milestone_plans/stylesheets/images/detail.gif" onmouseout="hidePopup()" onmouseover="showPopup(&quot;<detail> Typically when editing we incrementally update the schema model to sync with the DOM. Sometimes we find ourselves closing/opening the editor to ensure we have a 'clean' state. We need to add some strategic 'checkpoints' where we can do a full 'reconcile' of the model to ensure model is consistent with the document. </detail>&quot;)"/>
+</li>
+<ul>
+<li>
+<description>Improve robustness of model/editor synchronization.</description>
+</li>
+<li>
+<description>Improve properties/source synchronization.</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Properties View</b>
+<ul>
+<li>
+<description>Provide API and extension points for specialized <i>annotation</i> editing views</description>
+<font color="8080FF"> [high]</font>
+</li>
+<li>
+<description>Improve generic support for <i>annotation</i> editing</description>
+<font color="8080FF"> [medium]</font>
+</li>
+<ul>
+<li>
+<description>Provide support for multiple annotations</description>
+</li>
+<li>
+<description>Provide source editing for XML content</description>
+</li>
+<li>
+<description>Provide tree view for XML content</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<table border="0" width="100%" cellpadding="2" cellspacing="5">
+<tbody>
+<tr>
+<td colspan="4" bgcolor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Legend</font>
+</font>
+</b>
+</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="14" height="5" src="../../../../development/milestone_plans/stylesheets/images/progress.gif"/>
+</td>
+<td width="50%">item is under development.</td>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+</td>
+<td width="50%">item is under investigation.</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/ok.gif"/>
+</td>
+<td width="50%">item is finished.</td>
+<td valign="top">
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</td>
+<td width="50%">help wanted</td>
+</tr>
+<tr>
+<td valign="top">
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/defer.gif"/>
+</td>
+<td width="50%">item is deferred.</td>
+<td valign="top">
+<font class="indexsub">
+<img src="../../../../development/milestone_plans/stylesheets/images/new.gif"/>
+</font>
+</td>
+<td width="50%">new</td>
+</tr>
+</tbody>
+</table>
+<table border="0" width="100%" cellPadding="2" cellSpacing="5">
+<tr>
+<a name="Overall_Planning">
+<td rowspan="3" colSpan="2" bgColor="#0080c0" width="100%" align="left" valign="top">
+<b>
+<font face="Arial,Helvetica">
+<font color="#ffffff">Future - under development and review - (updated 2005-03-07)</font>
+</font>
+</b>
+</td>
+</a>
+</tr>
+</table>
+<table width="100%" cellspacing="5">
+<tr>
+<td/>
+</tr>
+</table>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Overall XSD UI</b>
+<ul>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>Investigate additional API requirements</description>
+<font color="8080FF"> [medium]</font>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>Investigate XSD search function to find component refences in XSD, WSDL and XML</description>
+<font color="8080FF"> [low]</font>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<li>
+<description>Implement 'Open Declaration' support</description>
+<font color="8080FF"> [low]</font>
+<img width="40" height="12" src="../../../../development/milestone_plans/stylesheets/images/help.gif"/>
+</li>
+<li>
+<description>Provide iniitial XML Schema refactoring support</description>
+<font color="8080FF"> [medium]</font>
+</li>
+<ul>
+<li>
+<description>Move to 'common' refactoring infrastructure (similar to JDT refactoring)</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Graph View</b>
+<ul>
+<li>
+<description>Support visualization of additional objects and relationships</description>
+<font color="8080FF"> [medium]</font>
+</li>
+<ul>
+<li>
+<description>Display attributes in graphical view</description>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>Inheritance - allow supertypes/subtypes to be displayed</description>
+</li>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>Substitution groups - show 'choice' like object when elements belong to substiution groups</description>
+</li>
+</ul>
+<li>
+<description>Keep history of expansion state to make it more convenient to revisit view</description>
+<font color="8080FF"> [medium]</font>
+</li>
+<li>
+<description>Implement visualization of additional objects and relationships</description>
+<font color="8080FF"> [medium]</font>
+</li>
+<ul>
+<li>
+<img width="10" height="10" src="../../../../development/milestone_plans/stylesheets/images/glass.gif"/>
+<description>Display attributes in graphical view</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Properties View</b>
+<ul>
+<li>
+<description>Improve &lt;import&gt; editing</description>
+<font color="8080FF"> [medium]</font>
+</li>
+<ul>
+<li>
+<description>Support catalog browsing to locate to schemas</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Articles</b>
+<ul>
+<li>
+<description>Article - Introduction to the XML Schema Editor</description>
+<font color="8080FF"> [medium]</font>
+</li>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<tr>
+<td>
+<table>
+<tr>
+<td valign="top">
+<img height="16" border="0" nosave="" src="../../../../development/milestone_plans/stylesheets/images/Adarrow.gif"/>
+</td>
+<td>
+<b>Documentation Generation</b>
+<ul>
+<li>
+<description>Improve HTML documention generation</description>
+<font color="8080FF"> [low]</font>
+</li>
+<ul>
+<li>
+<description>Provide basic documentation generation support</description>
+</li>
+<li>
+<description>Refactor for reuse (e.g. so WSDL docgen links seamlessly with XSD docgen)</description>
+</li>
+<li>
+<description>Support &lt;annotation&gt; content in gen'd docs</description>
+</li>
+</ul>
+</ul>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+<br/>
+</body>
+</html>