bloritsch    02/01/30 11:52:33

  Modified:    docs/site binindex.html proposal.html roles.html source.html
                        sourceindex.html understandingopensource.html
                        whoweare.html
               docs/site/pmc 01-01-17-pictures.html
                        01-03-19-meeting-agenda.html
                        01-03-19-meeting-summary.html index.html
               xdocs/site binindex.xml news.xml sourceindex.xml
  Log:
  update site with new Avalon release info
  
  Revision  Changes    Path
  1.143     +1 -1      jakarta-site2/docs/site/binindex.html
  
  Index: binindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/binindex.html,v
  retrieving revision 1.142
  retrieving revision 1.143
  diff -u -r1.142 -r1.143
  --- binindex.html     29 Jan 2002 01:47:07 -0000      1.142
  +++ binindex.html     30 Jan 2002 19:52:32 -0000      1.143
  @@ -197,7 +197,7 @@
                                                   <ul>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-ant/release/v1.4.1/bin/";>Ant 
1.4.1</a></li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/framework/v4.1.1/";>Avalon
 Framework 4.1.1</a></li>
  -<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.0/";>Avalon
 Excalibur 4.0</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.1/";>Avalon
 Excalibur 4.1</a></li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/logkit/v1.0/";>Avalon 
LogKit 1.0</a></li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-cactus/release/v1.2/";>Cactus 
1.2</a></li>
   <li><a href="http://www.apache.org/dist/jakarta/jakarta-ecs/release/v1.4.1/";>ECS 
1.4.1</a></li>
  
  
  
  1.29      +432 -124  jakarta-site2/docs/site/proposal.html
  
  Index: proposal.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/proposal.html,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- proposal.html     19 Jan 2002 13:15:35 -0000      1.28
  +++ proposal.html     30 Jan 2002 19:52:32 -0000      1.29
  @@ -14,6 +14,8 @@
                                                       <meta name="author" value="Ted 
Husted">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - Proposed Changes - Jakarta Project 
Guidelines</title>
           </head>
   
  @@ -141,7 +143,8 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                                    <h3 align="center"><font 
color="#FF0000"><b>This is a working draft document.<br /></b></font>It is being 
created from discussions on the Jakarta General mailing list.<br />
  +                                    <h3 align="center"><font 
color="#FF0000"><b>This is a working draft document.<br />
  +</b></font>It is being created from discussions on the Jakarta General mailing 
list.<br />
   In due course, this document will be submitted for approval<br />
   as an update to the existing guidelines.</h3>
                                                   <p align="center">For the current 
version of the actual document, see &lt; <a 
href="http://jakarta.apache.org/site/guidelines.html";>http://jakarta.apache.org/site/guidelines.html</a>
 &gt;.</p>
  @@ -164,30 +167,93 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   This document defines the guidelines of The Jakarta Project<font color="#800000"> 
and its subprojects</font>. It
   includes definitions of the various categories of membership, who is
   able to vote, how conflicts are resolved by voting, and the procedures
  -to follow for proposing and making changes to the codebase<font 
color="#800000">s</font> of the Project. <font color="#800000">Each subproject may 
adopt additional guidelines, which may extend but not supercede the Project 
guidelines.</font></p><ul>
  -
  -<li><a href="#roles">Roles and Responsibilities</a><br /> <span 
class="itemdef">Defines the recognized roles in the project</span><ul><li> <span 
class="itemdef"><a href="#roles/users">Users</a></span></li><li> <span 
class="itemdef"><a href="#roles/developers">Developers</a></span></li><li> <span 
class="itemdef"><a href="#roles/committers">Committers</a></span></li><li> <span 
class="itemdef"><a href="#roles/manager">Release Manager</a></span></li><li> <span 
class="itemdef"><a href="#roles/pmc">Project Management Committee 
(PMC)</a></span></li></ul></li>
  -
  -<li><a href="#communication">Communication</a><br /> <span class="itemdef">Defines 
how users and developers communicate.</span><ul><li> <span class="itemdef"><a 
href="#communication/ann">Announcement Lists</a></span></li><li> <span 
class="itemdef"><a href="#communication/user">User Lists</a></span></li><li> <span 
class="itemdef"><a href="#communication/dev">Developer Lists</a></span></li><li> <span 
class="itemdef"><a href="#communication/commit">Commit Lists</a></span></li></ul></li>
  +to follow for proposing and making changes to the codebase<font 
color="#800000">s</font> of the Project. <font color="#800000">Each subproject may 
adopt additional guidelines, which may extend but not supercede the Project 
guidelines.</font>
  +</p>
  +<ul>
  +
  +<li><a href="#roles">Roles and Responsibilities</a><br /> <span 
class="itemdef">Defines the recognized roles in the project</span>
  +<ul>
  +<li> <span class="itemdef"><a href="#roles/users">Users</a></span></li>
  +<li> <span class="itemdef"><a href="#roles/developers">Developers</a></span></li>
  +<li> <span class="itemdef"><a href="#roles/committers">Committers</a></span></li>
  +<li> <span class="itemdef"><a href="#roles/manager">Release Manager</a></span></li>
  +<li> <span class="itemdef"><a href="#roles/pmc">Project Management Committee 
(PMC)</a></span></li>
  +</ul>
  +</li>
  +
  +<li><a href="#communication">Communication</a><br /> <span class="itemdef">Defines 
how users and developers communicate.</span>
  +<ul>
  +<li> <span class="itemdef"><a href="#communication/ann">Announcement 
Lists</a></span></li>
  +<li> <span class="itemdef"><a href="#communication/user">User Lists</a></span></li>
  +<li> <span class="itemdef"><a href="#communication/dev">Developer 
Lists</a></span></li>
  +<li> <span class="itemdef"><a href="#communication/commit">Commit 
Lists</a></span></li>
  +</ul>
  +</li>
   
   <li><a href="#decisions">Decision Making</a><br /> <span class="itemdef">Defines 
how action items are proposed and voted
  -on.</span><ul><li><a href="#decisions/items">Action Item</a><ul><li><a 
href="#decisions/items/ltplans">Long Term Plans</a></li><li><a 
href="#decisions/items/stplans">Short Term Plans</a></li><li><a 
href="#decisions/items/plan">Release Plan</a></li><li><a 
href="#decisions/items/testing">Release Testing</a></li><li><a 
href="#decisions/items/release">Public Release</a></li><li><a 
href="#decisions/items/showstoppers">Showstoppers</a></li><li><a 
href="#decisions/items/changes">Product Changes</a></li></ul></li><li><a 
href="#decisions/voting">Voting</a><ul><li><a href="#decisions/voting/items">Action 
Item Votes</a></li><li><a href="#decisions/voting/caveats">Voting 
Caveats</a></li><li><a href="#decisions/voting/plans">Other Items</a></li><li><a 
href="#decisions/voting/other">Voting on Other Matters</a></li></ul></li><li><a 
href="#decisions/branches">Branches</a></li></ul></li>
  +on.</span>
  +<ul>
  +<li><a href="#decisions/items">Action Item</a>
  +<ul>
  +<li><a href="#decisions/items/ltplans">Long Term Plans</a></li>
  +<li><a href="#decisions/items/stplans">Short Term Plans</a></li>
  +<li><a href="#decisions/items/plan">Release Plan</a></li>
  +<li><a href="#decisions/items/testing">Release Testing</a></li>
  +<li><a href="#decisions/items/release">Public Release</a></li>
  +<li><a href="#decisions/items/showstoppers">Showstoppers</a></li>
  +<li><a href="#decisions/items/changes">Product Changes</a></li>
  +</ul>
  +</li>
  +<li><a href="#decisions/voting">Voting</a>
  +<ul>
  +<li><a href="#decisions/voting/items">Action Item Votes</a></li>
  +<li><a href="#decisions/voting/caveats">Voting Caveats</a></li>
  +<li><a href="#decisions/voting/plans">Other Items</a></li>
  +<li><a href="#decisions/voting/other">Voting on Other Matters</a></li>
  +</ul>
  +</li>
  +<li><a href="#decisions/branches">Branches</a></li>
  +</ul>
  +</li>
   
   <li><a href="#source">Source Repositories</a><br /> <span class="itemdef">Defines 
how the Project's source code is organized
  -and developed.</span><ul><li><a href="#source/license">License</a></li><li><a 
href="#source/status">Status Files</a></li><li><a 
href="#source/branches">Branches</a></li><li><a 
href="#source/changes">Changes</a></li><li><a 
href="#source/patches">Patches</a></li></ul></li>
  +and developed.</span>
  +<ul>
  +<li><a href="#source/license">License</a></li>
  +<li><a href="#source/status">Status Files</a></li>
  +<li><a href="#source/branches">Branches</a></li>
  +<li><a href="#source/changes">Changes</a></li>
  +<li><a href="#source/patches">Patches</a></li>
  +</ul>
  +</li>
   
   <li><a href="http://jakarta.apache.org/site/management.html";>Project 
Management</a><br /> <span class="itemdef">Defines the roles and responsibilities of 
the
  -Project Management Committee (PMC). </span><ul><li> <a 
href="#pmc/background">Background</a></li><li> <span class="itemdef"><a 
href="#pmc/roles">Role</a></span></li><li> <a href="#pmc/duties">Duties</a></li><li> 
<span class="itemdef"><a href="#pmc/meetings">Meetings</a> </span></li><li> <span 
class="itemdef"><a href="#pmc/voting">Voting</a> </span></li><li> <span 
class="itemdef"><a href="#pmc/chair">Chair</a> </span></li><li> <span 
class="itemdef"><a href="#pmc/membership">Membership</a> </span></li><li> <span 
class="itemdef"><a href="#pmc/nominees">New Members</a></span></li><li> <span 
class="itemdef"><a href="#pmc/subprojects">Creation of Subprojects</a> 
</span></li></ul></li>
  +Project Management Committee (PMC). </span>
  +<ul>
  +<li> <a href="#pmc/background">Background</a></li>
  +<li> <span class="itemdef"><a href="#pmc/roles">Role</a></span></li>
  +<li> <a href="#pmc/duties">Duties</a></li>
  +<li> <span class="itemdef"><a href="#pmc/meetings">Meetings</a> </span></li>
  +<li> <span class="itemdef"><a href="#pmc/voting">Voting</a> </span></li>
  +<li> <span class="itemdef"><a href="#pmc/chair">Chair</a> </span></li>
  +<li> <span class="itemdef"><a href="#pmc/membership">Membership</a> </span></li>
  +<li> <span class="itemdef"><a href="#pmc/nominees">New Members</a></span></li>
  +<li> <span class="itemdef"><a href="#pmc/subprojects">Creation of Subprojects</a> 
</span></li>
  +</ul>
  +</li>
   
  -</ul><p>
  +</ul>
  +<p>
   This is a living document. Changes can be made by <font color="#800000"> a 3/4
   vote of </font>the <a href="#management"> Project
   Management Committee</a><font color="#800000">, after discussion on the General 
mailing list</font>.
  -</p></blockquote>
  +</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -208,56 +274,74 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   The roles and responsibilities that people can assume in the project 
   are based on merit. Everybody can help no matter what their role. 
   Those who have been long term or valuable contributors to the project 
   obtain the right to vote and commit directly to the source repository.
  -</p><h2><a name="roles/users">Users</a></h2><p>
  +</p>
  +<h2><a name="roles/users">Users</a></h2>
  +<p>
   Users are the people who use the products of the Project. People in
   this role aren't contributing code, but they are using the products,
   reporting bugs, making feature requests,<font color="#800000"> helping other users, 
extending the online FAQ, </font>and such. This is by far
   the most important category of people as, without users, there is no
   reason for the Project.
  -</p><p>
  +</p>
  +<p>
   When a user starts to contribute code or documentation patches, they
   become a developer.
  -</p><h2><a name="roles/developers">Developers</a></h2><p>
  +</p>
  +<h2><a name="roles/developers">Developers</a></h2>
  +<p>
   Developers are the people who write code or documentation patches or
   contribute positively to the project in other ways. A developer's
   contribution is always recognized. In source code, all developers
   who contribute to a source file may add their name to the list of
   authors for that file.
  -</p><h2><a name="roles/committers">Committers</a></h2><p>
  +</p>
  +<h2><a name="roles/committers">Committers</a></h2>
  +<p>
   Developers who give frequent and valuable contributions to a
   subproject of the Project can have their status promoted to that of
   a "<em>Committer</em>" for that subproject. A Committer
   has write access to the source code repository and gains voting
   rights allowing them to affect the future of the subproject.
  -</p><p>
  +</p>
  +<p>
   In order for a Developer to become a Committer, another Committer
   can nominate that Developer or the Developer can ask for it. Once a
   Developer is nominated, all of the Committers for a subproject will
   vote. If there are at least <a href="#decisions/voting/other"> 3 positive votes and 
no negative votes</a>, 
   the Developer is converted into a Committer and given write access 
   to the source code repository for that subproject. <font color="#800000">Before 
receiving write access, a Committer must also affirm that they have read and 
understood these guidelines, and agree to abide by
  -their terms, as they may be revised from time to time.</font></p><p>
  +their terms, as they may be revised from time to time.</font>
  +</p>
  +<p>
   At times, Committers may go inactive for a variety of reasons. A
   Committer that has been inactive for 6 months or more may lose his
   or her status as a Committer.
  -</p><p>
  +</p>
  +<p>
   A list of our current Committers can be found in our <a 
href="http://jakarta.apache.org/site/whoweare.html";>Project Credits</a>.
  -</p><h2><a name="roles/pmc">Project Management Committee (PMC)</a></h2><p>
  +</p>
  +<h2><a name="roles/pmc">Project Management Committee (PMC)</a></h2>
  +<p>
   Committers who frequently participate with valuable contributions may
   have their status promoted to that of a "<em>Project Management
   Committee Member</em>". This committee is the official managing
   body of the Jakarta Project and is responsible for setting overall 
   project direction. <strike> In order to become a Member, someone on 
   the PMC must nominate the Committer. The individual may then be
  -approved with a 3/4 majority of the PMC.</strike></p><p><strike>
  +approved with a 3/4 majority of the PMC.</strike>
  +</p>
  +<p><strike>
   To view the Project Management Committee bylaws, <a 
href="http://jakarta.apache.org/site/management.html";>
  -click here</a>.</strike></p><p><font color="#800000">For more about the Jakarta 
PMC, see the <a href="#management"> Project Management Committee bylaws</a>.</font>
  -A list of our current PMC Members can be found in our <a 
href="http://jakarta.apache.org/site/whoweare.html";>Project 
Credits</a>.</p></blockquote>
  +click here</a>.</strike></p>
  +<p><font color="#800000">For more about the Jakarta PMC, see the <a 
href="#management"> Project Management Committee bylaws</a>.</font>
  +A list of our current PMC Members can be found in our <a 
href="http://jakarta.apache.org/site/whoweare.html";>Project Credits</a>.</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -278,24 +362,29 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   The Project obtains its strength from the communication of its
   members. In order for members to easily communicate with each other,
   the Project has a variety of mailing lists. These lists, with the
   exception of the announcement lists, are not moderated and anybody
   is more than welcome to join them. However, you must be subscribed
   to post to a list.
  -</p><p>
  +</p>
  +<p>
   To reduce the bandwidth demands on everyone, mail should not contain
   attachments. It is recommended that you place interesting material
   (such as patches) either within the body of the message or
   provide a URL for retrieval.
  -</p><p>
  +</p>
  +<p>
   To join the mailing lists, see our <a 
href="http://jakarta.apache.org/site/mail.html";>
   Mailing List</a> page.
  -</p><p>
  +</p>
  +<p>
   The Project's list fall into the following categories:
  -</p></blockquote>
  +</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -315,11 +404,13 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   Announcement lists are very low traffic designed to communicate
   important information, such as final releases of a subproject's 
   code, to a wide audience.
  -</p></blockquote>
  +</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -339,10 +430,12 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   User lists are for users of a product to converse about such things
   as configuration and operating of the products of the Project. 
  -</p></blockquote>
  +</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -362,13 +455,15 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   Developer lists are for the developers of the project. On these
   lists suggestions and comments for code changes are discussed and
   action items are raised and voted on. For the developer community,
   these lists are the very center of the project where all the
   "action" is.
  -</p></blockquote>
  +</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -388,11 +483,13 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   The commit lists are where all <font color="#800000">CVS</font> code commit 
messages are
   sent. All committers are required to subscribe to this list so that
   they can stay aware of changes to the repository.
  -</p></blockquote>
  +</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -413,75 +510,142 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   All <a href="http://jakarta.apache.org/site/roles.html";>Developers</a> are 
encouraged
   to participate in decisions, but the decision itself is made by
   those that have <a href="http://jakarta.apache.org/site/roles.html";>Committer</a>
   status in the Project. In other words, the Project is a
   "<em>Minimum Threshold Meritocracy</em>".
  -</p><h2><a name="decisions/items">Action Items</a></h2><p>
  -All decisions revolve around "<em>action items.</em>" <font color="#800000">Most 
action items require a <a href="#decisions/voting">vote</a> to be approved. Votes can 
either be by <a href="#decisions/voting/majority">majority</a> or by <a 
href="#decisions/voting/consensus">consensus</a>.</font></p><p>
  +</p>
  +<h2><a name="decisions/items">Action Items</a></h2>
  +<p>
  +All decisions revolve around "<em>action items.</em>" <font color="#800000">Most 
action items require a <a href="#decisions/voting">vote</a> to be approved. Votes can 
either be by <a href="#decisions/voting/majority">majority</a> or by <a 
href="#decisions/voting/consensus">consensus</a>.</font>
  +</p>
  +<p>
   Action items <strike>consist of</strike> <font color="#800000">include</font> the 
following:
  -</p><ul><li><a href="#decisions/items/ltplans">Long Term Plans</a> <font 
color="#800000">- No vote required.</font></li><li><a 
href="#decisions/items/stplans">Short Term Plans</a> <font color="#800000">- No vote 
required.</font></li><li><a href="#decisions/items/plan">Release Plan</a> <font 
color="#800000">- Lazy majority vote on each issue, or lazy consensus if issue 
involves a product change.</font></li><li><a href="#decisions/items/testing">Release 
Testing</a><font color="#800000"> - No vote required, once Release Plan is 
approved.</font></li><li><font color="#800000"><a 
href="#decisions/items/release">Public Release</a> - Majority vote, if no showstoppers 
are listed in the status file.</font></li><li><a 
href="#decisions/items/showstoppers">Showstoppers</a> <font color="#800000">- Lazy 
consensus until resolved and removed from status file.</font></li><li><a 
href="#decisions/items/changes">Product Changes</a> <font color="#800000">- Lazy 
consensus.</font></li></ul><h3><a name="decisions/items/ltplans">Long Term 
Plans</a></h3><p>
  +</p>
  +<ul>
  +<li><a href="#decisions/items/ltplans">Long Term Plans</a> <font color="#800000">- 
No vote required.</font></li>
  +<li><a href="#decisions/items/stplans">Short Term Plans</a> <font color="#800000">- 
No vote required.</font></li>
  +<li><a href="#decisions/items/plan">Release Plan</a> <font color="#800000">- Lazy 
majority vote on each issue, or lazy consensus if issue involves a product 
change.</font></li>
  +<li><a href="#decisions/items/testing">Release Testing</a><font color="#800000"> - 
No vote required, once Release Plan is approved.</font></li>
  +<li><font color="#800000"><a href="#decisions/items/release">Public Release</a> - 
Majority vote, if no showstoppers are listed in the status file.</font></li>
  +<li><a href="#decisions/items/showstoppers">Showstoppers</a> <font 
color="#800000">- Lazy consensus until resolved and removed from status 
file.</font></li>
  +<li><a href="#decisions/items/changes">Product Changes</a> <font color="#800000">- 
Lazy consensus.</font></li>
  +</ul>
  +<h3><a name="decisions/items/ltplans">Long Term Plans</a></h3>
  +<p>
   Long term plans are simply announcements that group members are
   working on particular issues related to the Project. These are not
   voted on, but Developers who do not agree with a particular plan, or
   think that an alternative plan would be better, are obligated to
   inform the group of their feelings.
  -</p><h3><a name="decisions/items/stplans">Short Term Plan<font 
color="#800000">s</font></a></h3><p>
  +</p>
  +<h3><a name="decisions/items/stplans">Short Term Plan<font 
color="#800000">s</font></a></h3>
  +<p>
   Short term plans are announcements that a developer is working on a
   particular set of documentation or code files with the implication
   that other developers should avoid them or try to coordinate their
   changes.
  -</p><h3><a name="decisions/items/plan">Release Plan</a></h3><p>
  +</p>
  +<h3><a name="decisions/items/plan">Release Plan</a></h3>
  +<p>
   A release plan is used to keep all Developers aware of when a
   release is desired, who will be the Release Manager, when the
   repository will be frozen to create a release, and other assorted
   information to keep Developers from tripping over each other. Lazy
   majority decides each issue in a release plan<font color="#800000">, or lazy 
consensus if the issue involves a product change</font>.
  -</p><h3><a name="decisions/items/testing">Release Testing</a></h3><p>
  +</p>
  +<h3><a name="decisions/items/testing">Release Testing</a></h3>
  +<p>
   After a new release is built, it must be tested before being
   released to the public. <font color="#800000">After the release plan is approved, 
the Release Manager will announce that a product is ready for testing.</font> 
  -</p><h3><a name="decisions/items/release"><font color="#800000">Public 
Release</font></a></h3><p><font color="#800000">Once the Release Manager determines 
that testing is complete, and all showstoppers for the release have been resolved, the 
Release Manager shall call for a vote on the public release. Majority approval is 
required before the
  -public release can be made. The Committers who approve a public release (vote 
<b>+1</b>) are expected to provide ongoing support for that release while it is 
current. The Release Manager must summarize the outcome of the vote before the public 
release becomes final.</font></p><h3><a 
name="decisions/items/showstoppers">Showstoppers</a></h3><p>
  +</p>
  +<h3>
  +<a name="decisions/items/release"><font color="#800000">Public Release</font></a>
  +</h3>
  +<p><font color="#800000">Once the Release Manager determines that testing is 
complete, and all showstoppers for the release have been resolved, the Release Manager 
shall call for a vote on the public release. Majority approval is required before the
  +public release can be made. The Committers who approve a public release (vote 
<b>+1</b>) are expected to provide ongoing support for that release while it is 
current. The Release Manager must summarize the outcome of the vote before the public 
release becomes final.</font>
  +</p>
  +<h3><a name="decisions/items/showstoppers">Showstoppers</a></h3>
  +<p>
   Showstoppers are issues that require a fix be in place before the
   next public release. They are listed in the status file in order to
   focus special attention on these problems. An issue becomes a
   showstopper when it is listed as such in the status file and remains
   so by lazy consensus.
  -</p><h3><a name="decisions/items/changes">Product Changes</a></h3><p>
  +</p>
  +<h3><a name="decisions/items/changes">Product Changes</a></h3>
  +<p>
   Changes to the products of the Project, including code and
   documentation, will appear as action items in the status file. All
   product <a href="#source/changes"> changes to the currently active repository</a> 
are subject to
  -lazy consensus.</p><h2><a name="decisions/voting"><font 
color="#800000">Voting</font></a></h2><h4><font color="#800000"><a 
name="decisions/voting/items">Action Item Votes</a></font></h4><p>
  +lazy consensus.</p>
  +<h2><a name="decisions/voting"><font color="#800000">Voting</font></a></h2>
  +<h4>
  +<font color="#800000"><a name="decisions/voting/items">Action Item Votes</a></font>
  +</h4>
  +<p>
   The act of voting <font color="#800000">on an action item</font> carries certain 
obligations. Voting members are
   not only stating their opinion, they are also agreeing to help do
   the work.
  -</p><p><font color="#800000">Any Developer or Committer ("member") may call for an 
action-item vote on the <a href="#communication/dev"> Developer mailing list</a>. It 
is preferred that a vote be preceded by a formal proposal
  +</p>
  +<p><font color="#800000">Any Developer or Committer ("member") may call for an 
action-item vote on the <a href="#communication/dev"> Developer mailing list</a>. It 
is preferred that a vote be preceded by a formal proposal
   offered for discussion purposes. The message announcing a vote should contain a 
Subject beginning with "[VOTE]", and a distinctive one-line
  -summary corresponding to the <a href="#decisions/items"> action item</a> for the 
vote.</font></p><p>Each vote <font color="#800000">on an action item</font> can be 
made in one of <strike> three</strike> <font color="#800000">four</font> flavors:</p>
  +summary corresponding to the <a href="#decisions/items"> action item</a> for the 
vote.</font></p>
  +<p>Each vote <font color="#800000">on an action item</font> can be made in one of 
<strike> three</strike> <font color="#800000">four</font> flavors:</p>
   
   <table border="0">
   
  -<tr valign="top"><td width="50"><p><b>+1</b></p></td> <td>"<font 
color="#800000">T</font>he action should be performed<font color="#800000">, and I 
will help.</font>"</td></tr>
  -
  -<tr valign="top"><td width="50"><p><b>+0</b></p></td> <td>"Abstain," <font 
color="#800000">"I support the action but I can't help."</font></td></tr>
  -
  -<tr valign="top"><td width="50"><b>-0</b></td> <td>"Abstain," <font 
color="#800000">"I don't support the action but I can't help with an 
alternative."</font></td></tr>
  -
  -<tr valign="top"><td width="50"><p><b>-1</b></p></td> <td><font 
color="#800000">"The action should not be performed and I am offering an explanation 
or alternative."</font></td></tr>
  -
  -</table><p><font color="#800000">Votes cast by the subproject's Committers are 
considered "binding". When needed, at least 3 binding <b>+1</b> votes are required for 
action-item approval.</font></p><p><font color="#800000">An action item may need one 
of two types of approval:</font></p><blockquote><p><b><font color="#800000"><a 
name="decisions/voting/consensus">Consensus</a></font></b><b><font color="#800000"><a 
name="decisions/voting/consensus">  approval</a></font><br /></b>
  +<tr valign="top">
  +<td width="50"><p><b>+1</b></p></td> <td>"<font color="#800000">T</font>he action 
should be performed<font color="#800000">, and I will help.</font>"</td>
  +</tr>
  +
  +<tr valign="top">
  +<td width="50"><p><b>+0</b></p></td> <td>"Abstain," <font color="#800000">"I 
support the action but I can't help."</font></td>
  +</tr>
  +
  +<tr valign="top">
  +<td width="50"><b>-0</b></td> <td>"Abstain," <font color="#800000">"I don't support 
the action but I can't help with an alternative."</font></td>
  +</tr>
  +
  +<tr valign="top">
  +<td width="50"><p><b>-1</b></p></td> <td><font color="#800000">"The action should 
not be performed and I am offering an explanation or alternative."</font></td>
  +</tr>
  +
  +</table>
  +<p>
  +<font color="#800000">Votes cast by the subproject's Committers are considered 
"binding". When needed, at least 3 binding <b>+1</b> votes are required for 
action-item approval.</font>
  +</p>
  +<p><font color="#800000">An action item may need one of two types of 
approval:</font>
  +</p>
  +<blockquote>
  +<p>
  +<b><font color="#800000"><a 
name="decisions/voting/consensus">Consensus</a></font></b><b><font color="#800000"><a 
name="decisions/voting/consensus">  approval</a></font><br />
  +</b>
   An action requiring consensus approval must receive at least
   <b>3 binding +1</b> votes and <b>no binding
   vetos</b>.
  -</p><p><b><font color="#800000"><a name="decisions/voting/majority">Majority 
approval</a><br /></font></b> An action requiring majority approval must receive
  +</p>
  +<p>
  +<b><font color="#800000"><a name="decisions/voting/majority">Majority 
approval</a><br />
  +</font></b> An action requiring majority approval must receive
   at least <b>3 binding +1</b> votes and more
   <b>+1</b> votes than <b>-1</b>  votes.
  -</p></blockquote><p><strike>All other</strike> <font color="#800000">Except for a 
public release, all </font> action items are considered to have lazy approval until 
somebody
  +</p>
  +</blockquote>
  +<p>
  +<strike>All other</strike> <font color="#800000">Except for a public release, all 
</font> action items are considered to have lazy approval until somebody
   votes <b>-1</b>, <strike> after</strike> <font color="#800000">at</font> which 
point <strike>they are</strike> <font color="#800000">the action item is</font>  
<strike> decided by either</strike> <font color="#800000">converted to a formal</font> 
consensus or majority vote, depending on the <a href="#decisions/items"> type of 
action item</a>.
  -</p><blockquote><p><font color="#800000">Note: "Lazy" means the action item has 
immediate tactic approval, and it is not necessary to tally the vote until a <b> 
-1</b> reply is posted. Once a <b>-1</b> reply is posted, the vote must be tallied and 
reported before the
  -action item is considered approved. All action-item votes are lazy except for a 
public release vote.</font></p></blockquote><p>
  +</p>
  +<blockquote>
  +<p>
  +<font color="#800000">Note: "Lazy" means the action item has immediate tactic 
approval, and it is not necessary to tally the vote until a <b> -1</b> reply is 
posted. Once a <b>-1</b> reply is posted, the vote must be tallied and reported before 
the
  +action item is considered approved. All action-item votes are lazy except for a 
public release vote.</font>
  +</p>
  +</blockquote>
  +<p>
   Any <strike>Developer</strike> member may vote on any <strike> issue or</strike> 
action item <font color="#800000">or related issue</font>. <strike> However, the
   only <b> binding</b> <b> votes</b> are those cast by a Committer.</strike> <strike> 
If the vote is
   about a change to the source code or documentation and the primary
  @@ -490,35 +654,66 @@
   if it is needed.</font>All
   binding vetos <b> must</b>  <font color="#800000">also</font> contain an 
explanation of why
   the veto is appropriate.
  -</p><h4><font color="#800000"><a name="decisions/voting/caveats">Voting 
Caveats</a></font></h4><ul><li>A <b>+1</b> vote regarding product code <strike>is 
only</strike> can only be made 
  -binding if the voter has tested the action on their own <strike>system(s)</strike> 
equipment.</li><li> <font color="#800000">A binding<b> +1</b> vote on a public release 
means the subproject's Committer agrees to provide ongoing support for that release 
while it is current.</font></li><li> An abstention may have detrimental effects if too 
many
  -people abstain.</li><li> Vetos with no explanation are void. <strike>No veto
  +</p>
  +<h4><font color="#800000"><a name="decisions/voting/caveats">Voting 
Caveats</a></font>
  +</h4>
  +<ul>
  +<li>A <b>+1</b> vote regarding product code <strike>is only</strike> can only be 
made 
  +binding if the voter has tested the action on their own <strike>system(s)</strike> 
equipment.</li>
  +<li> <font color="#800000">A binding<b> +1</b> vote on a public release means the 
subproject's Committer agrees to provide ongoing support for that release while it is 
current.</font></li>
  +<li> An abstention may have detrimental effects if too many
  +people abstain.</li>
  +<li> Vetos with no explanation are void. <strike>No veto
   can be overruled</strike>. If you disagree with the veto, you should lobby
   the person who cast the veto. Voters intending to veto an action
   item should make their opinions known to the group immediately so
  -that the problem can be remedied as early as possible.</li><li> <font 
color="#800000">If a Committer believes the explanation for a veto is invalid, an 
affirmation of the veto can be requested. If some other Committer does not affirm that 
the explanation for the veto is valid, the
  -veto shall be void.</font></li><li> <font color="#800000">If a dispute over a veto 
becomes intractable, the PMC may consent to arbitrate the matter, and, if appropriate, 
rescind the veto with a 3/4 majority vote of the PMC members.</font></li><li><font 
color="#800000">Members who wish to discuss a vote before replying, may open another 
thread to help avoid premature vetos. Any <b>+/-1</b>'s or <b>+/-0</b>'s posted to an 
alternate thread, or any other thread not labeled "[VOTE]", are considered 
conversational, and <b>do not</b> qualify as an valid action-item vote. A "lazy item" 
remains subject to lazy approval until a valid <b>-1</b> reply is
  -posted to the "[VOTE]" thread.</font></li></ul><h4><font color="#800000"><a 
name="decisions/voting/results">Vote Results</a></font></h4><p><font 
color="#800000">Most action items are subject to lazy approval, and do not require the 
posting of a formal result.</font></p><p><font color="#800000"> However, any other 
majority item that receives any <b> -1</b> reply (later rescinded or not) <b> must</b> 
 be followed by a "[VOTE-RESULT]" message before the action item is considered 
approved.
  +that the problem can be remedied as early as possible.</li>
  +<li> <font color="#800000">If a Committer believes the explanation for a veto is 
invalid, an affirmation of the veto can be requested. If some other Committer does not 
affirm that the explanation for the veto is valid, the
  +veto shall be void.</font></li>
  +<li> <font color="#800000">If a dispute over a veto becomes intractable, the PMC 
may consent to arbitrate the matter, and, if appropriate, rescind the veto with a 3/4 
majority vote of the PMC members.</font></li>
  +<li><font color="#800000">Members who wish to discuss a vote before replying, may 
open another thread to help avoid premature vetos. Any <b>+/-1</b>'s or <b>+/-0</b>'s 
posted to an alternate thread, or any other thread not labeled "[VOTE]", are 
considered conversational, and <b>do not</b> qualify as an valid action-item vote. A 
"lazy item" remains subject to lazy approval until a valid <b>-1</b> reply is
  +posted to the "[VOTE]" thread.</font></li>
  +</ul>
  +<h4><font color="#800000"><a name="decisions/voting/results">Vote 
Results</a></font></h4>
  +<p><font color="#800000">Most action items are subject to lazy approval, and do not 
require the posting of a formal result.</font></p>
  +<p><font color="#800000"> However, any other majority item that receives any <b> 
-1</b> reply (later rescinded or not) <b> must</b>  be followed by a "[VOTE-RESULT]" 
message before the action item is considered approved.
   Likewise, any consensus item that receives any <b> binding veto</b> must post a 
"[VOTE-RESULT]" message summarizing the result, and show that each veto was
   rescinded, before it is
   considered approved.</font> <font color="#800000">In either case, the member who 
requested the vote should also post the result within 120 hours (5 days). Any question 
regarding the
  -outcome of an action-item vote may be referred by a Committer to the <a 
href="#management"> PMC</a> for arbitration.</font></p><p><font color="#800000">A 
<b>Public Release</b>  is not considered approved until the Release Manager posts a 
followup message with the legend "[VOTE-RESULT]" summarizing the 
replies.</font></p><h4><font color="#800000"><a name="decisions/voting/plans">Other 
Items</a></font></h4><p><font color="#800000">Proposals are not a formal action item; 
however, the message offering a proposal should contain a Subject beginning with 
"[PROPOSAL]". It is <b> strongly</b> recommended that a proposal be circulated before 
calling for a formal vote.
  -Often, once members have had the chance to critique a proposal, an updated copy of 
a proposal can be reposted as the vote document.</font></p><p><font 
color="#800000">Most other messages posted to the Developer's List usually involve 
either short-term or long-term plans. Often, a long-term plan will be made in the form 
of a "[PROPOSAL]". If
  -appropriate, the proposed change or feature may then be entered to the subproject's 
STATUS file or TODO list.</font></p><h4><font color="#800000"><a 
name="decisions/voting/other">Voting on other matters</a></font></h4><p><font 
color="#800000">There are other matters upon which members will vote that do not 
involve action items. The same general voting structure is used in these cases, except 
that the "flavors" are
  -taken to mean</font></p><table border="0">
  -
  -<tr valign="top"><td width="50"><p><b>+1</b></p></td> <td>"Yes," "Agree,"</td></tr>
  -
  -<tr valign="top"><td width="50"><p><b>+0</b></p></td> <td>"Abstain," "No 
opinion."</td></tr>
  -
  -<tr valign="top"><td width="50"><b>-0</b></td> <td>"Abstain," <font 
color="#800000">"Unsure."</font></td></tr>
  +outcome of an action-item vote may be referred by a Committer to the <a 
href="#management"> PMC</a> for arbitration.</font></p>
  +<p><font color="#800000">A <b>Public Release</b>  is not considered approved until 
the Release Manager posts a followup message with the legend "[VOTE-RESULT]" 
summarizing the replies.</font></p>
  +<h4><font color="#800000"><a name="decisions/voting/plans">Other 
Items</a></font></h4>
  +<p><font color="#800000">Proposals are not a formal action item; however, the 
message offering a proposal should contain a Subject beginning with "[PROPOSAL]". It 
is <b> strongly</b> recommended that a proposal be circulated before calling for a 
formal vote.
  +Often, once members have had the chance to critique a proposal, an updated copy of 
a proposal can be reposted as the vote document.</font></p>
  +<p><font color="#800000">Most other messages posted to the Developer's List usually 
involve either short-term or long-term plans. Often, a long-term plan will be made in 
the form of a "[PROPOSAL]". If
  +appropriate, the proposed change or feature may then be entered to the subproject's 
STATUS file or TODO list.</font></p>
  +<h4><font color="#800000"><a name="decisions/voting/other">Voting on other 
matters</a></font></h4>
  +<p><font color="#800000">There are other matters upon which members will vote that 
do not involve action items. The same general voting structure is used in these cases, 
except that the "flavors" are
  +taken to mean</font></p>
  +<table border="0">
   
  -<tr valign="top"><td width="50"><p><b>-1</b></p></td> <td>"No," "<font 
color="#800000">Disagree."</font></td></tr>
  +<tr valign="top">
  +<td width="50"><p><b>+1</b></p></td> <td>"Yes," "Agree,"</td>
  +</tr>
  +
  +<tr valign="top">
  +<td width="50"><p><b>+0</b></p></td> <td>"Abstain," "No opinion."</td>
  +</tr>
  +
  +<tr valign="top">
  +<td width="50"><b>-0</b></td> <td>"Abstain," <font 
color="#800000">"Unsure."</font></td>
  +</tr>
  +
  +<tr valign="top">
  +<td width="50"><p><b>-1</b></p></td> <td>"No," "<font 
color="#800000">Disagree."</font></td>
  +</tr>
   
  -</table></blockquote>
  +</table>
  +</blockquote>
   
   <h2><a name="decisions/branches"><font color="#800000">Branches</font></a></h2>
  -<blockquote><p>
  +<blockquote>
  +<p>
   In any software development project there is a natural tension between revolution 
   and evolution. Many software development teams, open or closed, have a team leader 
   who can declare whether the code base is in evolutionary or revolutionary mode. In 
  @@ -526,34 +721,41 @@
   to enforce. Our meritocracy is fueled by voluntary contributions, and so we must 
   allow everyone to contribute, and then base our final product decisions on the 
   contributions we actually receive. 
  -</p><p>
  +</p>
  +<p>
   Accordingly, as a matter of Jakarta policy, these principles are adopted:
  -</p></blockquote>
  -<ol><li>
  +</p>
  +</blockquote>
  +<ol>
  +<li>
   Every committer has the right to revolution. Anyone can establish a branch or
   seperate whiteboard directory in which to experiment with new code seperate from 
   the main trunk. The only responsibility a committer has when they do this is to 
   announce their short and long range plans, and allow others who want to help to 
   do so. Committers working on a revolutionary branch have the right to develop 
   their approach free of interference. 
  -</li><li>
  +</li>
  +<li>
   When a revolution is considered ready for prime time, the committer(s) shall 
   propose a merge to the developers list. At that time, the overall community 
   evaluates whether or not the code is ready to become part of, or to potentially 
   replace, the trunk. Suggestions may be made, changes may be required. Once all 
   issues have been taken care of and the merge is approved, the new code may 
   become the trunk.
  -</li><li>
  +</li>
  +<li>
   All development branches should be unversioned. No branch, evolutionary or 
   revolutionary, should have any official version standing. This allows several 
   parallel tracks of development to occur with the final authority of what eventually 
   becomes the trunk resting with the entire community of committers.
  -</li><li>
  +</li>
  +<li>
   The trunk is the official versioned line of the project. All evolutionary minded 
   people are welcome to work on it to improve it. Evolutionary work is important and 
   should not stop as it is always unclear when any particular revolution will be 
ready 
   for prime time or whether it will be officially accepted.
  -</li></ol>
  +</li>
  +</ol>
   
   
               </font>
  @@ -575,21 +777,27 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><p>
  +<blockquote>
  +<p>
   The Project's codebase is maintained in shared information
   repositories using CVS on the dev.apache.org machine. Only
   Committers have write access to these repositories. Everyone has
   read access via anonymous CVS.
  -</p><p>
  +</p>
  +<p>
   All Java Language source code in the repository must be written in
   conformance to the "<a 
href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html";>Code
   Conventions for the Java Programming Language</a> as published by Sun.
  -</p><h2><a name="source/license">License</a></h2><p>
  +</p>
  +<h2><a name="source/license">License</a></h2>
  +<p>
   All source code committed to the Project's repositories must be
   covered by the <a href="http://jakarta.apache.org/LICENSE";>Apache License</a> or 
contain a
   copyright and license that allows redistribution under the same
   conditions as the Apache License.
  -</p><h2><a name="source/status">Status Files</a></h2><p>
  +</p>
  +<h2><a name="source/status">Status Files</a></h2>
  +<p>
   Each of the Project's active source code repositories contain a file
   named <span class="code">STATUS</span> which is used to keep track
   of the agenda and plans for work within that repository. The status
  @@ -598,69 +806,128 @@
   that are under discussion, brief notes about items that individual
   developers are working on or want discussion about, and anything
   else that may be useful to help the group track progress.
  -</p><p>
  +</p>
  +<p>
   The active status files are automatically posted to the developer
   mailing lists three times per week.
  -</p><h2><a name="source/branches">Branches</a></h2><p>
  +</p>
  +<h2><a name="source/branches">Branches</a></h2>
  +<p>
   Groups are allowed to create a branch for release cycles, etc. They
   are expected to merge completely back with the main branch as soon
   as their release cycle is complete.
  -</p><p><font color="#800000">A branch is considered "evolutionary" by lazy 
consensus. Upon any dispute (<a href="#decisions/voting">binding veto</a>), a branch 
must be converted to "revolutionary"
  +</p>
  +<p><font color="#800000">A branch is considered "evolutionary" by lazy consensus. 
Upon any dispute (<a href="#decisions/voting">binding veto</a>), a branch must be 
converted to "revolutionary"
   status, and must be assigned a working name that does not imply it will be the next 
version of the product. Once a release plan for the branch has been approved, and the 
proposed release is ready for testing, it may be
   assigned a version name reflecting it is a product release candidate, and merged 
back with the main branch, as appropriate to the circumstances. Any branch, 
"evolutionary" or "revolutionary", shall
  -meet the same standard for release approval.</font></p><h2><a 
name="source/changes">Changes</a></h2><p>
  +meet the same standard for release approval.</font>
  +</p>
  +<h2><a name="source/changes">Changes</a>
  +</h2>
  +<p>
   Simple patches to fix bugs can be committed then reviewed. With a
   commit-then-review process, the Committer is trusted to have a high
   degree of confidence in the change.
  -</p><p>
  +</p>
  +<p>
   Doubtful changes, new features, and large scale overhauls need to be
   discussed before committing them into the repository. Any change
   that affects the semantics of an existing API function, the size of
   the program, configuration data formats, or other major areas must
   receive consensus approval before being committed.
  -</p><p>
  +</p>
  +<p>
   Related changes should be committed as a group, or very closely
   together. Half complete projects should never be committed to the
   main branch of a development repository. All code changes must be
   successfully compiled on the developer's platform before being
  -committed. <font color="#800000">This includes XML code that is used to build 
documentation.</font></p><p>
  +committed. <font color="#800000">This includes XML code that is used to build 
documentation.</font>
  +</p>
  +<p>
   The current source code tree for a subproject should be capable of
   complete compilation at all times. However, it is sometimes
   impossible for a developer on one platform to avoid breaking some
   other platform when a change is committed. If it is anticipated that
   a given change will break the build on some other platform, the
   committer must indicate that in the commit message.
  -</p><p>
  +</p>
  +<p>
   A committed change must be reversed if it is vetoed by one of the
   voting members and the veto conditions cannot be immediately
   satisfied by the equivalent of a "bug fix" commit. The
   veto must be rescinded before the change can be included in any
   public release.
  -</p><h2><a name="source/patches">Patches</a></h2><p>
  +</p>
  +<h2><a name="source/patches">Patches</a></h2>
  +<p>
   When a specific change to a product is proposed for discussion or
   voting on the appropriate development mailing list, it should be
   presented in the form of input to the patch command. When sent to
   the mailing list, the message should contain a Subject beginning with <span 
class="code">[PATCH]</span>  and a distinctive one-line
   summary corresponding to the <a href="#decisions/items"> action item</a> for that 
patch.
  -</p><p>
  +</p>
  +<p>
   The patch should be created by using the <span class="code">diff
   -u</span> command from the original software file(s) to the modified
   software file(s). For example:
  -</p><div align="left"><table cellspacing="4" cellpadding="0" border="0"><tr><td 
bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td><td bgcolor="#023264" height="1"><img 
src="void.gif" vspace="0" hspace="0" border="0" width="1" height="1" /></td><td 
bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td></tr><tr><td bgcolor="#023264" width="1"><img 
src="void.gif" vspace="0" hspace="0" border="0" width="1" height="1" /></td><td 
bgcolor="#ffffff"><pre>
  +</p>
  +<div align="left">
  +<table cellspacing="4" cellpadding="0" border="0">
  +<tr>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" height="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +</tr>
  +<tr>
  +<td bgcolor="#023264" width="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +<td bgcolor="#ffffff"><pre>
   diff -u Main.java.orig Main.java &gt;&gt; patchfile.txt
  -</pre></td><td bgcolor="#023264" width="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td></tr><tr><td bgcolor="#023264" 
width="1" height="1"><img src="void.gif" vspace="0" hspace="0" border="0" width="1" 
height="1" /></td><td bgcolor="#023264" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td><td bgcolor="#023264" width="1" 
height="1"><img src="void.gif" vspace="0" hspace="0" border="0" width="1" height="1" 
/></td></tr></table></div><p>or</p><div align="left"><table cellspacing="4" 
cellpadding="0" border="0"><tr><td bgcolor="#023264" width="1" height="1"><img 
src="void.gif" vspace="0" hspace="0" border="0" width="1" height="1" /></td><td 
bgcolor="#023264" height="1"><img src="void.gif" vspace="0" hspace="0" border="0" 
width="1" height="1" /></td><td bgcolor="#023264" width="1" height="1"><img 
src="void.gif" vspace="0" hspace="0" border="0" width="1" height="1" 
/></td></tr><tr><td bgcolor="#023264" width="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td><td bgcolor="#ffffff"><pre>
  +</pre></td>
  +<td bgcolor="#023264" width="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +</tr>
  +<tr>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" height="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +</tr>
  +</table>
  +</div>
  +<p>or</p>
  +<div align="left">
  +<table cellspacing="4" cellpadding="0" border="0">
  +<tr>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" height="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +</tr>
  +<tr>
  +<td bgcolor="#023264" width="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +<td bgcolor="#ffffff"><pre>
   cvs diff -u Main.java &gt;&gt; patchfile.txt
  -</pre></td><td bgcolor="#023264" width="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td></tr><tr><td bgcolor="#023264" 
width="1" height="1"><img src="void.gif" vspace="0" hspace="0" border="0" width="1" 
height="1" /></td><td bgcolor="#023264" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td><td bgcolor="#023264" width="1" 
height="1"><img src="void.gif" vspace="0" hspace="0" border="0" width="1" height="1" 
/></td></tr></table></div><p>or (Win32)</p><p>
  +</pre></td>
  +<td bgcolor="#023264" width="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +</tr>
  +<tr>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" height="1"><img src="void.gif" vspace="0" hspace="0" 
border="0" width="1" height="1" /></td>
  +<td bgcolor="#023264" width="1" height="1"><img src="void.gif" vspace="0" 
hspace="0" border="0" width="1" height="1" /></td>
  +</tr>
  +</table>
  +</div>
  +<p>or (Win32)</p>
  +<p>
   You can use <a href="http://www.wincvs.org/";>WinCVS</a> for a nice GUI or
   you can install <a href="http://sources.redhat.com/cygwin/";>Cygwin</a> which
   will enable you to use the bash shell and also installs a lot of other
   utilities (such as diff and patch) that will turn your PC into a virtual
   Unix machine.
  -</p><p>
  +</p>
  +<p>
   All patches necessary to address an action item should be <font 
color="#800000">concatenated</font> within a single patch message. If later 
modification
   to the patch proves necessary, the entire new patch should be posted
   and not just the difference between the two patches.
  -</p></blockquote>
  +</p>
  +</blockquote>
   
               </font>
   </td>
  @@ -681,35 +948,70 @@
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" 
align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   
  -<blockquote><h4><font color="#800000"><a name="pmc/background">
  -Background</a></font></h4><p><font color="#000000">
  +<blockquote>
  +<h4><font color="#800000">
  +<a name="pmc/background">
  +Background</a></font></h4>
  +<p><font color="#000000">
   The Jakarta Project Management Committee (PMC) was formed by the Apache Board in 
September 1999. The PMC is answerable to the Apache Board with its Chair serving as 
primary liaison.</font><font color="#800000">
   The Apache Software Foundation (ASF) owns the entire body of the Apache Public 
Licensed code, but
  -delegates the daily maintenance of these codebases to individual Project Management 
Committees, including the Jakarta PMC. The ASF is run as a meritocracy, with decision 
making delegated to the PMCs and their subproject Committers whenever 
possible.</font></p><h4><font color="#000000"><a name="pmc/role">
  -Role<strike>s</strike></a></font></h4><p><font color="#000000">
  +delegates the daily maintenance of these codebases to individual Project Management 
Committees, including the Jakarta PMC. The ASF is run as a meritocracy, with decision 
making delegated to the PMCs and their subproject Committers whenever 
possible.</font></p>
  +<h4><font color="#000000"><a name="pmc/role">
  +Role<strike>s</strike></a></font></h4>
  +<p><font color="#000000">
   The PMC is responsible for the strategic direction and overall success of the 
Jakarta Project, </font><font color="#800000">
   through its subprojects and products. Jakarta is a meritocracy, and decision making 
is delegated to the subproject Committers whenever possible. </font><strike> This 
governing body is expected to
   ensure the project's welfare and guide its overall direction. The PMC
   may not necessarily participate in the day-to-day coding but is
   involved in the overall development plans, the alleviation of any
   bottlenecks, the resolution of conflicts, and the overall technical
  -success of the project.</strike></p><h4><font color="#800000"><a name="pmc/duties">
  -Duties</a></font></h4><p><font color="#800000">
  -Responsibilities of the PMC include:</font></p><ul><li><font color="#000000">the 
active discussion of Project issues, strategic direction, and forward 
progress,</font></li><li><font color="#800000">the consideration and approval of new 
subprojects,</font></li><li><font color="#800000">retiring inactive subprojects and 
Committers as necessary,</font></li><li><font color="#800000">arbitrating otherwise 
intractable disputes regarding subproject voting and vetos,</font></li><li><font 
color="#800000">the security and reliability of the Project's Web site, mailing lists, 
code repositories, and related services,</font></li><li><font color="#800000">legal 
issues involving the Project and its subprojects, and</font></li><li><font 
color="#800000">maintaining Project and subproject scope as chartered by the ASF 
corporation</font></li></ul><h4><font color="#800000"><a 
name="pmc/meetings">Meetings</a></font></h4><p><font color="#800000">The PMC shall 
conduct as much business as possible on the Jakarta General mailing list. Sensitive 
business may also be conducted on the closed PMC mailing list if prudent. The PMC may 
also convene regular
  +success of the project.</strike></p>
  +<h4><font color="#800000">
  +<a name="pmc/duties">
  +Duties</a></font></h4>
  +<p><font color="#800000">
  +Responsibilities of the PMC include:</font></p>
  +<ul>
  +<li><font color="#000000">the active discussion of Project issues, strategic 
direction, and forward progress,</font></li>
  +<li><font color="#800000">the consideration and approval of new 
subprojects,</font></li>
  +<li><font color="#800000">retiring inactive subprojects and Committers as 
necessary,</font></li>
  +<li><font color="#800000">arbitrating otherwise intractable disputes regarding 
subproject voting and vetos,</font></li>
  +<li><font color="#800000">the security and reliability of the Project's Web site, 
mailing lists, code repositories, and related services,</font></li>
  +<li><font color="#800000">legal issues involving the Project and its subprojects, 
and</font></li>
  +<li><font color="#800000">maintaining Project and subproject scope as chartered by 
the ASF corporation</font></li>
  +</ul>
  +<h4><font color="#800000"><a name="pmc/meetings">Meetings</a></font></h4>
  +<p><font color="#800000">The PMC shall conduct as much business as possible on the 
Jakarta General mailing list. Sensitive business may also be conducted on the closed 
PMC mailing list if prudent. The PMC may also convene regular
   </font><strike> monthly</strike> <font color="#800000"> meetings with a majority of 
its members attending. </font><font color="#000000"> These meetings may
  -take place online, via teleconference, or via other means deemed effective by the 
PMC. </font><font color="#800000"> The PMC shall post a regular status report to 
General list, along with minutes of any "off-list" meetings.</font></p><h4><font 
color="#800000"><a name="pmc/voting">
  -Voting</a></font></h4><p><font color="#800000">
  -Only a PMC member may call for a vote of the PMC or cast a binding vote on a PMC 
matter.</font></p><p><font color="#800000">
  -The voting pool is based on the current PMC membership. All PMC members are 
expected to formally vote or abstain when a vote is called. PMC members who 
continually fail to vote or otherwise participate may lose their PMC 
status.</font></p><p><font color="#800000">
  +take place online, via teleconference, or via other means deemed effective by the 
PMC. </font><font color="#800000"> The PMC shall post a regular status report to 
General list, along with minutes of any "off-list" meetings.</font></p>
  +<h4><font color="#800000">
  +<a name="pmc/voting">
  +Voting</a></font></h4>
  +<p><font color="#800000">
  +Only a PMC member may call for a vote of the PMC or cast a binding vote on a PMC 
matter.</font></p>
  +<p><font color="#800000">
  +The voting pool is based on the current PMC membership. All PMC members are 
expected to formally vote or abstain when a vote is called. PMC members who 
continually fail to vote or otherwise participate may lose their PMC status.</font></p>
  +<p><font color="#800000">
   Most PMC actions require a "super-majority vote", where at least 3/4's of the 
current PMC members must cast a positive vote for the action to be approved. When 
computation of 3/4's of the current membership does not produce a whole number, the 
result shall be rounded the nearest whole number (.5 and
  -higher rounds up).</font></p><h4><font color="#800000"><a 
name="pmc/chair">Chair</a></font></h4><p><font color="#000000">The term of the PMC 
Chair is one year. </font><font color="#800000"> The election of the Chair may take 
place on the Jakarta General list or at another meeting with a majority of PMC members 
in attendance. The Chair is elected by a simple majority of PMC members. All PMC 
members are expected to vote or to
  -formally abstain. If a tie vote cannot be otherwise resolved, there shall be a 
simple majority vote of the subproject Committers on the General mailing 
list.</font></p><p>The Chair may resign as Chair at any time without resigning 
membership to the PMC. <font color="#800000"> The Chair may be re-elected to a 
subsequent term.</font> The exiting Chair retains PMC membership status.</p><h4><font 
color="#800000"><a name="pmc/membership">Membership</a></font></h4><p><font 
color="#800000">
  +higher rounds up).</font></p>
  +<h4><font color="#800000"><a name="pmc/chair">Chair</a></font></h4>
  +<p><font color="#000000">The term of the PMC Chair is one year. </font><font 
color="#800000"> The election of the Chair may take place on the Jakarta General list 
or at another meeting with a majority of PMC members in attendance. The Chair is 
elected by a simple majority of PMC members. All PMC members are expected to vote or to
  +formally abstain. If a tie vote cannot be otherwise resolved, there shall be a 
simple majority vote of the subproject Committers on the General mailing 
list.</font></p>
  +<p>The Chair may resign as Chair at any time without resigning membership to the 
PMC. <font color="#800000"> The Chair may be re-elected to a subsequent term.</font> 
The exiting Chair retains PMC membership status.</p>
  +<h4><font color="#800000"><a name="pmc/membership">Membership</a></font></h4>
  +<p><font color="#800000">
   There is no term limit for PMC members. T</font><font color="#000000">he list of 
current PMC members is to be maintained in the Jakarta Project Credits.</font><font 
color="#800000">
  -All PMC members should be active Committers to one or more Jakarta subprojects 
(preferably more).</font></p><p><font color="#800000">PMC members may resign at any 
time. The Chair or any member may be removed from the PMC by a super-majority vote of 
the PMC members.</font></p><h4><font color="#800000"><a name="pmc/nominees">New 
Members</a></font></h4><p><font color="#800000">A subproject Committer may be 
nominated for the PMC by a current PMC member. Nominees should realize that 
participation in the PMC requires a regular and sustained commitment of their time, 
and is not to be taken lightly. A nominee becomes a PMC member by a successful
  -super-majority vote.</font></p><h4><font color="#800000"><a 
name="subprojects">Creation of subprojects</a></font></h4><p><font color="#000000">
  +All PMC members should be active Committers to one or more Jakarta subprojects 
(preferably more).</font></p>
  +<p><font color="#800000">PMC members may resign at any time. The Chair or any 
member may be removed from the PMC by a super-majority vote of the PMC 
members.</font></p>
  +<h4><font color="#800000"><a name="pmc/nominees">New Members</a></font></h4>
  +<p><font color="#800000">A subproject Committer may be nominated for the PMC by a 
current PMC member. Nominees should realize that participation in the PMC requires a 
regular and sustained commitment of their time, and is not to be taken lightly. A 
nominee becomes a PMC member by a successful
  +super-majority vote.</font></p>
  +<h4><font color="#800000"><a name="subprojects">Creation of 
subprojects</a></font></h4>
  +<p><font color="#000000">
   PMC members may propose the creation of new subprojects. Proposals are to contain 
the scope of the project, identify the initial source from which the project is to be 
populated, identify the mailing list(s) if any which are to be created, and identify 
the initial set of
   Committers. Creation of a new subproject requires approval by super-majority vote 
of the PMC.</font><font color="#800000">
  -It is preferred but not required that at least one PMC member be a Committer to a 
new subproject.</font></p></blockquote>
  +It is preferred but not required that at least one PMC member be a Committer to a 
new subproject.</font></p>
  +</blockquote>
   
               </font>
   </td>
  @@ -737,6 +1039,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.35      +8 -0      jakarta-site2/docs/site/roles.html
  
  Index: roles.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/roles.html,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- roles.html        15 Jan 2002 22:56:08 -0000      1.34
  +++ roles.html        30 Jan 2002 19:52:32 -0000      1.35
  @@ -16,6 +16,8 @@
                                           <meta name="author" value="Ted Husted">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - Roles and Responsibilities</title>
           </head>
   
  @@ -347,6 +349,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.36      +8 -0      jakarta-site2/docs/site/source.html
  
  Index: source.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/source.html,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- source.html       18 Jan 2002 23:28:49 -0000      1.35
  +++ source.html       30 Jan 2002 19:52:32 -0000      1.36
  @@ -14,6 +14,8 @@
                                                       <meta name="author" value="Jon 
S. Stevens">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - Source Repositories</title>
           </head>
   
  @@ -354,6 +356,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.94      +49 -10    jakarta-site2/docs/site/sourceindex.html
  
  Index: sourceindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/sourceindex.html,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- sourceindex.html  19 Jan 2002 13:15:35 -0000      1.93
  +++ sourceindex.html  30 Jan 2002 19:52:32 -0000      1.94
  @@ -14,6 +14,8 @@
                                                       <meta name="author" value="Jon 
S. Stevens">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - Source Downloads</title>
           </head>
   
  @@ -157,20 +159,27 @@
   particular type of build. We divide our available source code into the
   following categories:
   </p>
  -                                                <ul><li>Release Source 
Drops</li><li>Milestone Source Drops</li><li>Automated Snapshots</li></ul>
  -                                                <p><b>Release Source Drops</b> are 
those that are ready for Prime
  +                                                <ul>
  +<li>Release Source Drops</li>
  +<li>Milestone Source Drops</li>
  +<li>Automated Snapshots</li>
  +</ul>
  +                                                <p>
  +<b>Release Source Drops</b> are those that are ready for Prime
   Time. These releases have been reviewed to ensure compatability with
   the Servlets and JavaServer Pages Specification. This build is "as
   good as it gets" and represents the version that should be used for
   all commercial-grade products.
   </p>
  -                                                <p><b>Milestone Source Drops</b> 
are those that are somewhat stable but
  +                                                <p>
  +<b>Milestone Source Drops</b> are those that are somewhat stable but
   not crystal-clean.  We have some confidence in them, but they are
   buggy and should only be used by advanced users who want to explore
   future product direction or take advantage of new features. This build
   should not be used for commercial-grade products going to market.
   </p>
  -                                                <p><b>Automated Nightly 
Snapshots</b> are created every N hours directly from
  +                                                <p>
  +<b>Automated Nightly Snapshots</b> are created every N hours directly from
   the active CVS repository. These are for developers who are helping to
   develop the technology and want "the latest bits." Use at your own
   risk! While running these probably won't erase your hard drive, you
  @@ -179,23 +188,47 @@
                                                   <p>
   To get a binary version, <a href="./binindex.html">click here</a>.
   </p>
  -                                                <p><b>Note:</b> In order to build 
Tomcat, you'll need to download both the Tomcat
  +                                                <p>
  +<b>Note:</b> In order to build Tomcat, you'll need to download both the Tomcat
   workspace and Tools workspace into parallel directories.
   </p>
                                                   <h2>
   Release Builds
   </h2>
  -                                                <ul><li><a 
href="http://www.apache.org/dist/jakarta/ant/release/v1.4.1/src/";>Ant
  -1.4.1</a> is the latest release of the Ant Subproject.</li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/framework/v4.1.1/";>Avalon
 Framework 4.1.1</a> is the latest release of the Avalon Framework</li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.0/";>Avalon
 Excalibur 4.0</a> is the latest release of Avalon Excalibur</li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/logkit/v1.0/";>Avalon 
LogKit 1.0</a> is the latest release of Avalon LogKit</li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-cactus/release/v1.2/";>Cactus 1.2</a>
  -is the latest release of the Cactus project.</li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-jmeter/release/v1.5/";>JMeter 
1.5.1</a> (binaries and source together...)</li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-struts/release/v1.0.1/src/";>Struts 
1.0.1</a></li><li><a 
href="http://www.apache.org/dist/jakarta/tomcat/release/v3.2.4/src/";>Tomcat 
3.2.4</a></li><li><a 
href="http://www.apache.org/dist/jakarta/tomcat/release/v3.3/src/";>Tomcat 3.3 (Updated 
to 3.3a)</a></li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-tomcat-4.0/release/v4.0.1/src/";>Tomcat
 4.0.1</a></li></ul>
  +                                                <ul>
  +<li><a href="http://www.apache.org/dist/jakarta/ant/release/v1.4.1/src/";>Ant
  +1.4.1</a> is the latest release of the Ant Subproject.</li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/framework/v4.1.1/";>Avalon
 Framework 4.1.1</a> is the latest release of the Avalon Framework</li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.1/";>Avalon
 Excalibur 4.1</a> is the latest release of Avalon Excalibur</li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/logkit/v1.0/";>Avalon 
LogKit 1.0</a> is the latest release of Avalon LogKit</li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-cactus/release/v1.2/";>Cactus 1.2</a>
  +is the latest release of the Cactus project.</li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-jmeter/release/v1.5/";>JMeter 
1.5.1</a> (binaries and source together...)</li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-struts/release/v1.0.1/src/";>Struts 
1.0.1</a></li>
  +<li><a href="http://www.apache.org/dist/jakarta/tomcat/release/v3.2.4/src/";>Tomcat 
3.2.4</a></li>
  +<li><a href="http://www.apache.org/dist/jakarta/tomcat/release/v3.3/src/";>Tomcat 
3.3 (Updated to 3.3a)</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-tomcat-4.0/release/v4.0.1/src/";>Tomcat
 4.0.1</a></li>
  +</ul>
                                                   <h2>
   Milestone Builds
   </h2>
  -                                                <ul><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/phoenix/latest/";>Avalon
 Phoenix 4.0 alpha 1</a></li></ul>
  +                                                <ul>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/phoenix/latest/";>Avalon
 Phoenix 4.0 alpha 1</a></li>
  +</ul>
                                                   <h2>
   Nightly Builds (May not compile or even run)
   </h2>
  -                                                <ul><li><a 
href="http://www.apache.org/dist/jakarta/ant/nightly/";>Ant</a></li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-cactus/nightly/";>Cactus</a></li><li><a
 
href="http://www.apache.org/dist/jakarta/jakarta-james/nightly/src/";>James</a></li><li><a
 
href="http://www.apache.org/dist/jakarta/jakarta-struts/nightly/src/";>Struts</a></li><li><a
 
href="http://www.apache.org/dist/jakarta/jakarta-taglibs/nightly/src/";>Taglibs</a></li><li><a
 href="http://www.apache.org/dist/jakarta/jakarta-tomcat/nightly-3.3.x/";>Tomcat 
3.3.x</a></li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-tomcat-4.0/nightly/src/";>Tomcat 
4.0-dev</a></li><li><a 
href="http://www.apache.org/dist/jakarta/jakarta-velocity/nightly/";>Velocity</a></li><li><a
 
href="http://www.apache.org/dist/jakarta/jakarta-watchdog/nightly/src/";>Watchdog</a></li></ul>
  +                                                <ul>
  +<li><a href="http://www.apache.org/dist/jakarta/ant/nightly/";>Ant</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-cactus/nightly/";>Cactus</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-james/nightly/src/";>James</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-struts/nightly/src/";>Struts</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-taglibs/nightly/src/";>Taglibs</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-tomcat/nightly-3.3.x/";>Tomcat 
3.3.x</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-tomcat-4.0/nightly/src/";>Tomcat 
4.0-dev</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-velocity/nightly/";>Velocity</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-watchdog/nightly/src/";>Watchdog</a></li>
  +</ul>
                               </blockquote>
           </p>
         </td></tr>
  @@ -217,6 +250,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.15      +11 -1     jakarta-site2/docs/site/understandingopensource.html
  
  Index: understandingopensource.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/understandingopensource.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- understandingopensource.html      19 Jan 2002 13:15:35 -0000      1.14
  +++ understandingopensource.html      30 Jan 2002 19:52:32 -0000      1.15
  @@ -14,6 +14,8 @@
                                                       <meta name="author" 
value="Cameron Riley">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - Understanding Opensource</title>
           </head>
   
  @@ -197,7 +199,9 @@
   </p>
                                                   <p>
   Cameron Riley
  -<br /><a href="mailto:criley NO SPAM ekmail.com">criley NO SPAM ekmail.com</a></p>
  +<br />
  +<a href="mailto:criley NO SPAM ekmail.com">criley NO SPAM ekmail.com</a>
  +</p>
                               </blockquote>
           </p>
         </td></tr>
  @@ -219,6 +223,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.70      +8 -0      jakarta-site2/docs/site/whoweare.html
  
  Index: whoweare.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/whoweare.html,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- whoweare.html     8 Jan 2002 23:06:25 -0000       1.69
  +++ whoweare.html     30 Jan 2002 19:52:32 -0000      1.70
  @@ -14,6 +14,8 @@
                                                       <meta name="author" value="Jon 
S. Stevens">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - Who We Are</title>
           </head>
   
  @@ -655,6 +657,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.14      +18 -4     jakarta-site2/docs/site/pmc/01-01-17-pictures.html
  
  Index: 01-01-17-pictures.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/pmc/01-01-17-pictures.html,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- 01-01-17-pictures.html    19 Jan 2002 13:15:36 -0000      1.13
  +++ 01-01-17-pictures.html    30 Jan 2002 19:52:32 -0000      1.14
  @@ -14,6 +14,8 @@
                                                       <meta name="author" value="Jon 
S. Stevens">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - Jakarta PMC Meeting 1/17/2001</title>
           </head>
   
  @@ -141,9 +143,13 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                                    <p><table border="0" cellpadding="5" 
cellspacing="2" width="100%" bgcolor="#F0F0F0"><tr>
  +                                    <p>
  +<table border="0" cellpadding="5" cellspacing="2" width="100%" bgcolor="#F0F0F0">
  +<tr>
        <td><font size="3" face="Arial">Jakarta PMC Meeting<br />1/17/2001</font>
  -     </td></tr></table>
  +     </td>
  +</tr>
  +</table>
   
   <center><table cellspacing="10" cellpadding="0" border="0">
   
  @@ -164,9 +170,11 @@
   </tr>
   
   <tr>
  -             <td align="left" colspan="4"><a 
href="../../images/pmc/112-1235_IMG.jpg"><img 
src="../../images/pmc/thumbnails/112-1235_IMG.jpg" border="0" alt="112-1235_IMG" 
/></a>   </td></tr>
  +             <td align="left" colspan="4"><a 
href="../../images/pmc/112-1235_IMG.jpg"><img 
src="../../images/pmc/thumbnails/112-1235_IMG.jpg" border="0" alt="112-1235_IMG" 
/></a>   </td>
  +</tr>
   
  -</table></center></p>
  +</table></center>
  +</p>
                               </blockquote>
           </p>
         </td></tr>
  @@ -188,6 +196,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.15      +16 -4     jakarta-site2/docs/site/pmc/01-03-19-meeting-agenda.html
  
  Index: 01-03-19-meeting-agenda.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/pmc/01-03-19-meeting-agenda.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- 01-03-19-meeting-agenda.html      19 Jan 2002 13:15:36 -0000      1.14
  +++ 01-03-19-meeting-agenda.html      30 Jan 2002 19:52:32 -0000      1.15
  @@ -14,6 +14,8 @@
                                                       <meta name="author" value="Sam 
Ruby">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - PMC Meeting Agenda - 2001-03-19</title>
           </head>
   
  @@ -149,7 +151,8 @@
     <p>Ceki G�lc�</p>
     <p>Geir Magnusson Jr.</p>
     <p>Daniel F. Savarese</p>
  -  <p>Jason van Zyl</p></blockquote>
  +  <p>Jason van Zyl</p>
  +</blockquote>
                                                   <p>2. Old Business:</p>
                                                   <blockquote>
     <p>2.1 Sam: revise the scope of Jakarta</p>
  @@ -161,11 +164,13 @@
     <p>2.5 James: put out a clear and separate e-mail to the tomcat mailing lists
     indicating what the criteria is for a release plan.</p>
     <p>2.6 Unassigned: Proposal for cvs layout</p>
  -  <p>2.7 James: review the bylaws.</p></blockquote>
  +  <p>2.7 James: review the bylaws.</p>
  +</blockquote>
                                                   <p>3. New Business:</p>
                                                   <blockquote>
     <p>3.1 Commons proposal</p>
  -  <p>3.2 PMC Member election process</p></blockquote>
  +  <p>3.2 PMC Member election process</p>
  +</blockquote>
                                                   <p>4. Subproject status</p>
                                                   <blockquote>
     <p>Note: in the long term, the way I would like to address item 3.2 above is
  @@ -173,7 +178,8 @@
     give each an opportunity to discuss issues, status, and progress here. What I
     am looking for is major events like the recent Ant 1.3 release, upcoming
     Velocity release and outlook for releases like Tomcat 4.1. Without formal
  -  assignments, I'm simply expecting everybody to bring what they 
know.</p></blockquote>
  +  assignments, I'm simply expecting everybody to bring what they know.</p>
  +</blockquote>
                                                   <p>5. Other changes in status of 
PMC members</p>
                                                   <p>6. Schedule for next meeting</p>
                               </blockquote>
  @@ -197,6 +203,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.15      +22 -7     jakarta-site2/docs/site/pmc/01-03-19-meeting-summary.html
  
  Index: 01-03-19-meeting-summary.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/pmc/01-03-19-meeting-summary.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- 01-03-19-meeting-summary.html     19 Jan 2002 13:15:36 -0000      1.14
  +++ 01-03-19-meeting-summary.html     30 Jan 2002 19:52:32 -0000      1.15
  @@ -14,6 +14,8 @@
                                                       <meta name="author" value="Sam 
Ruby">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - PMC Meeting Summary - 2001-03-19</title>
           </head>
   
  @@ -149,7 +151,8 @@
     <p style="margin-top: 0; margin-bottom: 0">Ceki G�lc�</p>
     <p style="margin-top: 0; margin-bottom: 0">Geir Magnusson Jr.</p>
     <p style="margin-top: 0; margin-bottom: 0">Daniel F. Savarese</p>
  -  <p style="margin-top: 0; margin-bottom: 0">Jason van Zyl</p></blockquote>
  +  <p style="margin-top: 0; margin-bottom: 0">Jason van Zyl</p>
  +</blockquote>
                                                   <p>2. Old Business:</p>
                                                   <blockquote>
     <p>2.1 Sam: revise the scope of Jakarta</p>
  @@ -251,7 +254,8 @@
       <p align="left">Ted has been stewarding this one. Current draft posted
       at <a 
href="http://jakarta.apache.org/site/proposal.html";>http://jakarta.apache.org/site/proposal.html</a>.
       Ted to report status at the next meeting.</p>
  -  </blockquote></blockquote>
  +  </blockquote>
  +</blockquote>
                                                   <p>3. New Business:</p>
                                                   <blockquote>
     <p>3.1 Commons proposal</p>
  @@ -265,20 +269,25 @@
     <p>General discussion of the recent XML PMC election was held. Some
     support was indicated for reforming the Jakarta election process along similar
     lines. Discussion will continue on general@jakarta.</p>
  -  </blockquote></blockquote>
  +  </blockquote>
  +</blockquote>
                                                   <p>4. Subproject status</p>
                                                   <blockquote>
     <p>Taglibs release a set of JDBC tags</p>
     <p>Tomcat 3.2.2 is imminent with a cross-scripting vulnerability fix</p>
     <p>Velocity plans a 1.0 release in April.</p>
  -  <p>Tomcat 4.1 no longer exists - Craig to clarify</p></blockquote>
  +  <p>Tomcat 4.1 no longer exists - Craig to clarify</p>
  +</blockquote>
                                                   <p>5. Other changes in status of 
PMC members</p>
  -                                                <blockquote><p>Anil and Hans have 
indicated their desires to discontinue their participation
  +                                                <blockquote>
  +<p>Anil and Hans have indicated their desires to discontinue their participation
   in the PMC. They will be missed. They are free to continue to
  -subscribe to the PMC mailing list.</p></blockquote>
  +subscribe to the PMC mailing list.</p>
  +</blockquote>
                                                   <p>6. Schedule for next meeting</p>
                                                   <blockquote>
  -  <p>Date was set for 16 April 2001 at 1900 GMT.</p></blockquote>
  +  <p>Date was set for 16 April 2001 at 1900 GMT.</p>
  +</blockquote>
                               </blockquote>
           </p>
         </td></tr>
  @@ -300,6 +309,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.16      +14 -3     jakarta-site2/docs/site/pmc/index.html
  
  Index: index.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/pmc/index.html,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- index.html        19 Jan 2002 13:15:36 -0000      1.15
  +++ index.html        30 Jan 2002 19:52:32 -0000      1.16
  @@ -16,6 +16,8 @@
                                           <meta name="author" value="Jon S. Stevens">
               <meta name="email" value="[EMAIL PROTECTED]">
               
  +           
  +                                    
               <title>The Jakarta Site - PMC Meeting Archive</title>
           </head>
   
  @@ -145,16 +147,19 @@
           <blockquote>
                                       <p>2001 April 22</p>
                                                   <ul>
  -  <li><a href="./01-04-22-meeting-irclog.html">Meeting Minutes (IRC 
Log)</a></li></ul>
  +  <li><a href="./01-04-22-meeting-irclog.html">Meeting Minutes (IRC Log)</a></li>
  +</ul>
                                                   <p>2001 March 19</p>
                                                   <ul>
     <li><a href="./01-03-19-meeting-agenda.html">Meeting Agenda</a></li>
     <li><a href="./01-03-19-meeting-irclog.html">Meeting Minutes (IRC Log)</a></li>
  -  <li><a href="./01-03-19-meeting-summary.html">Meeting Summary</a></li></ul>
  +  <li><a href="./01-03-19-meeting-summary.html">Meeting Summary</a></li>
  +</ul>
                                                   <p>2001 January 17</p>
                                                   <ul>
    <li><a href="./01-01-17-meeting-minutes.html">Meeting Minutes</a></li>
  - <li><a href="./01-01-17-pictures.html">Meeting Pictures</a></li></ul>
  + <li><a href="./01-01-17-pictures.html">Meeting Pictures</a></li>
  +</ul>
                               </blockquote>
           </p>
         </td></tr>
  @@ -176,6 +181,12 @@
           </body>
       </html>
   <!-- end the processing -->
  +
  +
  +
  +
  +
  +
   
   
   
  
  
  
  1.119     +1 -1      jakarta-site2/xdocs/site/binindex.xml
  
  Index: binindex.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/binindex.xml,v
  retrieving revision 1.118
  retrieving revision 1.119
  diff -u -r1.118 -r1.119
  --- binindex.xml      28 Jan 2002 17:17:56 -0000      1.118
  +++ binindex.xml      30 Jan 2002 19:52:33 -0000      1.119
  @@ -72,7 +72,7 @@
   <ul>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-ant/release/v1.4.1/bin/";>Ant 
1.4.1</a></li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/framework/v4.1.1/";>Avalon
 Framework 4.1.1</a></li>
  -<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.0/";>Avalon
 Excalibur 4.0</a></li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.1/";>Avalon
 Excalibur 4.1</a></li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/logkit/v1.0/";>Avalon 
LogKit 1.0</a></li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-cactus/release/v1.2/";>Cactus 
1.2</a></li>
   <li><a href="http://www.apache.org/dist/jakarta/jakarta-ecs/release/v1.4.1/";>ECS 
1.4.1</a></li>
  
  
  
  1.107     +25 -0     jakarta-site2/xdocs/site/news.xml
  
  Index: news.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/news.xml,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- news.xml  21 Jan 2002 17:17:30 -0000      1.106
  +++ news.xml  30 Jan 2002 19:52:33 -0000      1.107
  @@ -11,6 +11,31 @@
   
   <section name="News &amp; Status">
   
  +<?xml version="1.0" encoding="UTF-8"?>
  +<h3>30 January 2002 - Avalon Excalibur 4.1 Released</h3>
  +<p>The Avalon team is proud to announce the 4.1 final release
  +of the Avalon Excalibur.</p>
  +<p>
  +<b>About Avalon:</b>
  +      The Avalon project is Apache's Java Server Framework. It is
  +      separated into five sub projects: Framework, Excalibur, LogKit,
  +      Cornerstone, and Phoenix. Its purpose is to simplify
  +      server side programming for Java based projects.  It
  +      formalizes serveral best of breed practices and patterns for
  +      server side programming.
  +    <p>For more information about Avalon, please go to
  +    <a 
href="http://jakarta.apache.org/avalon";>http://jakarta.apache.org/avalon</a>.</p>
  +</p>
  +<p>
  +<b>About Avalon Excalibur 4.1:</b>
  +      Avalon Excalibur contains several premade Avalon Components
  +      and utilities to make your server side programming easier.
  +      There are several pool implementations, Component management
  +      implementations, and database management implementations.
  +    <p>For more information about Avalon Excalibur 4.1, please go to
  +    <a 
href="http://jakarta.apache.org/avalon/excalibur";>http://jakarta.apache.org/avalon/excalibur</a>.</p>
  +</p>
  +<hr size="1" noshade=""/>
   <h3>21 January 2001 - Tomcat 4.0.2 Beta 2 Released</h3>
   <p>
     The Tomcat Team is proud to announce the second beta release of Tomcat 4.0.2.
  
  
  
  1.67      +1 -1      jakarta-site2/xdocs/site/sourceindex.xml
  
  Index: sourceindex.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/sourceindex.xml,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- sourceindex.xml   14 Jan 2002 22:29:55 -0000      1.66
  +++ sourceindex.xml   30 Jan 2002 19:52:33 -0000      1.67
  @@ -73,7 +73,7 @@
   <li><a href="http://www.apache.org/dist/jakarta/ant/release/v1.4.1/src/";>Ant
   1.4.1</a> is the latest release of the Ant Subproject.</li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/framework/v4.1.1/";>Avalon
 Framework 4.1.1</a> is the latest release of the Avalon Framework</li>
  -<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.0/";>Avalon
 Excalibur 4.0</a> is the latest release of Avalon Excalibur</li>
  +<li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/excalibur/v4.1/";>Avalon
 Excalibur 4.1</a> is the latest release of Avalon Excalibur</li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-avalon/release/logkit/v1.0/";>Avalon 
LogKit 1.0</a> is the latest release of Avalon LogKit</li>
   <li><a 
href="http://www.apache.org/dist/jakarta/jakarta-cactus/release/v1.2/";>Cactus 1.2</a>
   is the latest release of the Cactus project.</li>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to