1.6.7 revisions
diff --git a/aspectjplan.xml b/aspectjplan.xml
index de8889e..22ffa3b 100644
--- a/aspectjplan.xml
+++ b/aspectjplan.xml
@@ -6,10 +6,10 @@
    <introduction>
      <html:div>AspectJ major versions match up with Java versions.  Currently Java is at 1.6 and so AspectJ
      is also at 1.6.  The AspectJ project then releases service refreshes to that major version every
-     few months.  During 2008 there have been 1.6.0 and 1.6.1, and we are planning two more
-     before year end. This is the release model we plan to continue with. </html:div>
+     few months.  Current release model is a point release every 3 months, this has worked through 2008
+     and so far through 2009. </html:div>
      <html:div>AspectJ always maintains that HEAD will build clean and pass all the tests we have (currently
-     around 3700).  This means the development builds created from HEAD after every commit are always at least
+     around 4200).  This means the development builds created from HEAD after every commit are always at least
      as good as the previous build.</html:div>
    </introduction>
    <release_deliverables>
@@ -21,16 +21,17 @@
       <preamble>
          <html:div></html:div>
       </preamble>
-      <milestone date="12/31/2008" milestone="1.6.3"><html:div>Service refresh of AspectJ 1.6</html:div></milestone>
-      <milestone date="03/31/2009" milestone="1.6.4"><html:div>Service refresh of AspectJ 1.6</html:div></milestone>
       <milestone date="06/30/2009" milestone="1.6.5"><html:div>Service refresh of AspectJ 1.6</html:div></milestone>
       <milestone date="09/31/2009" milestone="1.6.6"><html:div>Service refresh of AspectJ 1.6</html:div></milestone>
-      <postamble><html:div></html:div></postamble>
+      <milestone date="12/31/2009" milestone="1.6.7"><html:div>Service refresh of AspectJ 1.6</html:div></milestone>
+      <milestone date="03/31/2010" milestone="1.6.8"><html:div>Service refresh of AspectJ 1.6</html:div></milestone>
+      <postamble><html:div> </html:div></postamble>
    </release_milestones>
    <target_environments>
-     <html:div>The AspectJ compiler pre-reqs a 1.4 JRE (it is based on the Eclipse compiler and so
-     Java requirements for AspectJ tend to follow Eclipse compiler requirements).  The woven code produced
-     by AspectJ will run on any VM from Java 1.1 onwards.</html:div>
+     <html:div>During AspectJ 1.6.6 development the decision was made to exploit generics internally and
+     this has improved the quality of the codebase, this means the 1.6.6 weaver (and therefore compiler) now require
+     a Java 1.5 runtime.  Previous version of AspectJ required only Java 1.4</html:div>
+     <html:div>The woven code produced by AspectJ will run on any VM from Java 1.1 onwards.</html:div>
      <internationalization>
           <html:div>We have bundles for many of the messages in the project but they are not translated.</html:div>
      </internationalization>
@@ -43,25 +44,25 @@
      <preamble>
          <html:div>These are the larger themes and priorities right now:</html:div>
      </preamble>
-     <theme name="Improving the IDE experience (target 1.6.2)">
-        <description><html:div>One factor limiting the take up of AspectJ is that when converting a Java project to an AspectJ project
-        there is a reduction in responsiveness of incremental builds.  A tiny degradation is reasonable since AspectJ is
-        also weaving in addition to compiling, but currently the degradation is more than is reasonable.</html:div></description>
+     <theme name="Improving the IDE experience (target 1.6.7)">
+        <description><html:div>This is about maintaining an expected level of functionality and responsiveness when
+        a user switches from a Java project to an AspectJ project.  The latest requirement
+        in this area is the need to persist project state between eclipse restarts - otherwise a costly full build is necessary
+        each time eclipse is started.  This is *not* easy as the object graph after a build is not currently of the right
+        form to persist. </html:div></description>
         <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D+%5Bincremental%5D&amp;product=AspectJ&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
            <html:div>Planned [incremental] changes</html:div></committed>
         <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D+%5Bincremental%5D&amp;product=AspectJ&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
            <html:div>Planned [incremental] changes</html:div></proposed>
      </theme>
-     <!-- 
-     <theme name="Memory Usage (target 1.6.3)">
+     <theme name="Memory Usage (target 1.6.7)">
         <description><html:div>Improving it across all parts of AspectJ: compilation, weaving and load-time weaving</html:div></description>
         <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D+%5Bmemory%5D&amp;product=AspectJ&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
    		   <html:div>Planned [memory] changes</html:div></committed>
         <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D+%5Bmemory%5D&amp;product=AspectJ&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
            <html:div>Planned [memory] changes</html:div></proposed>
      </theme>
-     -->
-     <theme name="Reusable Matching (target 1.6.3)">
+     <theme name="Reusable Matching (ongoing)">
         <description><html:div>The weaver currently matches based on a bytecode representation of compiled types.  A reusable pointcut matcher would
         allow other representations of the types to be used for matching purposes.  A key goal here would be support for a JDT Java Element
         representation of types - this would mean compilation of code would no longer be required to determine a match.  This would
@@ -72,6 +73,7 @@
         <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D+%5Bsplit%5D&amp;product=AspectJ&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
             <html:div>Planned [split] changes</html:div></proposed>
      </theme>
+     <!-- 
      <theme name="LTW for Equinox Aspects (target 1.6.5)">
         <description><html:div>During the 1.6.5 timeframe the intention is to review AspectJ load-time weaving with respect to how
         it behaves in equinox aspects.  The OSGi environment may require changes to current ltw support.</html:div></description>
@@ -80,17 +82,18 @@
         <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D+AOSGi&amp;product=AspectJ&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
             <html:div>Planned [ltw] changes</html:div></proposed>
      </theme>
+     -->
      <theme name="Full set of work items for next release">
-        <description><html:div>The fixes and enhancements that are in 1.6.5 development builds and those still scheduled to be completed before final release.</html:div></description>
-        <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D&amp;product=AspectJ&amp;target_milestone=1.6.5&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
+        <description><html:div>The fixes and enhancements that are in 1.6.6 development builds and those still scheduled to be completed before final release.</html:div></description>
+        <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D&amp;product=AspectJ&amp;target_milestone=1.6.6&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
            <html:div>Planned 1.6.5 changes</html:div></proposed>
-        <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=AspectJ&amp;target_milestone=1.6.5&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
+        <committed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=&amp;product=AspectJ&amp;target_milestone=1.6.6&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=RESOLVED&amp;bug_status=VERIFIED&amp;bug_status=CLOSED&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
    		   <html:div>Planned 1.6.5 changes</html:div></committed>
      </theme>
      <theme name="Planned changes for future releases">
-        <description><html:div>Items planned for 1.6.6</html:div></description>
-        <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D&amp;product=AspectJ&amp;target_milestone=1.6.6&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
-           <html:div>Planned 1.6.6 changes</html:div></proposed>
+        <description><html:div>Items planned for 1.6.7</html:div></description>
+        <proposed bugzilla="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&amp;short_desc_type=allwordssubstr&amp;short_desc=%5Bplan%5D&amp;product=AspectJ&amp;target_milestone=1.6.7&amp;long_desc_type=allwordssubstr&amp;long_desc=&amp;bug_file_loc_type=allwordssubstr&amp;bug_file_loc=&amp;status_whiteboard_type=allwordssubstr&amp;status_whiteboard=&amp;keywords_type=allwords&amp;keywords=&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_severity=blocker&amp;bug_severity=critical&amp;bug_severity=major&amp;bug_severity=normal&amp;bug_severity=minor&amp;bug_severity=trivial&amp;emailtype1=substring&amp;email1=&amp;emailtype2=substring&amp;email2=&amp;bugidtype=include&amp;bug_id=&amp;votes=&amp;chfieldfrom=&amp;chfieldto=Now&amp;chfieldvalue=&amp;cmdtype=doit&amp;order=Reuse+same+sort+as+last+time&amp;field0-0-0=noop&amp;type0-0-0=noop&amp;value0-0-0=">
+           <html:div>Planned 1.6.7 changes</html:div></proposed>
      </theme>
    </themes_and_priorities>
    <!-- appendix name="Project Refactoring">