You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@jakarta.apache.org by cr...@apache.org on 2001/04/03 08:41:04 UTC

cvs commit: jakarta-site2/xdocs/site binindex.xml news.xml sourceindex.xml

craigmcc    01/04/02 23:41:03

  Modified:    docs/site binindex.html decisions.html dirlayout.html
                        news.html proposal.html sourceindex.html
                        whoweare.html
               xdocs/site binindex.xml news.xml sourceindex.xml
  Log:
  Updates for Tomcat 4.0-beta-3 release.
  
  Revision  Changes    Path
  1.40      +21 -12    jakarta-site2/docs/site/binindex.html
  
  Index: binindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/binindex.html,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- binindex.html	2001/04/03 04:18:26	1.39
  +++ binindex.html	2001/04/03 06:41:00	1.40
  @@ -144,20 +144,18 @@
   <li>Release Builds</li>
   <li>Milestone Builds</li>
   <li>Nightly Builds</li>
  +<li>Demo Builds</li>
   </ul>
                                                   <p>
  -<b>Release Builds</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!"
  +<b>Release Builds</b> are those that are ready for Prime Time. This
  +build is "as good as it gets!"
   </p>
                                                   <p>
   <b>Milestone Builds</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. For Tomcat
  -developers, these builds serve as a mechanism to track progress
  -towards a release.
  +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. For developers, these
  +builds serve as a mechanism to track progress towards a release.
   </p>
                                                   <p>
   <b>Nightly Builds</b> are those that are very unstable
  @@ -166,6 +164,11 @@
   latest bits." Use at your own risk!
   </p>
                                                   <p>
  +<b>Demo Builds</b> are useful for showing demonstrations of our
  +products. For example, we packaged a sample <a href="/velocity/">Velocity</a> application with a minimal distribution
  +of <a href="/tomcat/">Tomcat</a> 3.x and 4.x.
  +</p>
  +                                                <p>
   To get the actual source code, <a href="./sourceindex.html">click here</a>.
   </p>
                                                   <h2>
  @@ -181,6 +184,7 @@
   <li><a href="/builds/jakarta-regexp/release/v1.2/">Regexp 1.2</a></li>
   <li><a href="/builds/jakarta-tomcat/release/v3.1.1/bin/">Tomcat 3.1.1</a></li>
   <li><a href="/builds/jakarta-tomcat/release/v3.2.1/bin/">Tomcat 3.2.1</a></li>
  +<li><a href="/builds/jakarta-velocity/release/v1.0/">Velocity 1.0</a></li>
   </ul>
                                                   <h2>
   Milestone Builds
  @@ -190,9 +194,8 @@
   <li><a href="/builds/jakarta-tomcat/release/v3.2.2-beta-2/bin/">Tomcat 3.2.2 beta 2</a></li>
   <li><a href="/builds/jakarta-tomcat/release/v3.3-m2/bin/">Tomcat 3.3
   Milestone 2</a></li>
  -<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b2/">Tomcat 4.0 beta
  -2</a></li>
  -<li><a href="/builds/jakarta-velocity/release/v1.0b2/">Velocity 1.0b2</a></li>
  +<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b3/">Tomcat 4.0 beta
  +3</a></li>
   </ul>
                                                   <h2>
   Nightly Builds
  @@ -206,6 +209,12 @@
   <li><a href="/builds/jakarta-tomcat/nightly/">Tomcat 3.x</a></li>
   <li><a href="/builds/jakarta-tomcat-4.0/nightly/">Tomcat 4.0-dev</a></li>
   <li><a href="/builds/jakarta-watchdog/nightly/">Watchdog</a></li>
  +</ul>
  +                                                <h2>
  +Demo Builds
  +</h2>
  +                                                <ul>
  +<li><a href="/builds/jakarta-velocity/demo/">Velocity 1.0 - ForumDemo</a></li>
   </ul>
                               </blockquote>
         </td></tr>
  
  
  
  1.20      +31 -6     jakarta-site2/docs/site/decisions.html
  
  Index: decisions.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/decisions.html,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- decisions.html	2001/04/03 04:18:28	1.19
  +++ decisions.html	2001/04/03 06:41:01	1.20
  @@ -153,30 +153,55 @@
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                &nbsp;
  +                <strong>+1</strong>
               </font>
   </td>
                                   <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +      "Yes," "Agree," or "the action should be
  +      performed." On some issues this is only binding if the voter
  +      has tested the action on their own system(s).
  +  
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                &nbsp;
  +                <strong>+/-0</strong>
               </font>
   </td>
                                   <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +      "Abstain," "no opinion". An abstention may
  +      have detrimental effects if too many people abstain.
  +  
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                &nbsp;
  +                <strong>-1</strong>
               </font>
   </td>
                                   <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +      "No." On issues where consensus is required, this vote
  +      counts as a <strong>veto</strong>. All vetos must contain an
  +      explanation of why the veto is appropriate. Vetos with no
  +      explanation are void. No veto can be overruled. 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.
  +  
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <p>
     An action requiring consensus approval must receive at least
  
  
  
  1.12      +349 -67   jakarta-site2/docs/site/dirlayout.html
  
  Index: dirlayout.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/dirlayout.html,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- dirlayout.html	2001/04/03 04:18:28	1.11
  +++ dirlayout.html	2001/04/03 06:41:01	1.12
  @@ -167,176 +167,458 @@
                           <tr>
                           <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
  +                Directory name
  +            </font>
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
  +                Content
  +            </font>
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
  +                Comment
  +            </font>
  +</td>
  +                                <td bgcolor="#039acc" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                Under CVS Control?
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                LICENSE.txt
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                A copy of the Apache License
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                The LICENSE.txt should be placed at a prominent location.
  + This file should have the suffix .txt so that it can be opened
  + easily on platforms that use suffix mappings.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                src/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Source code.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                <p>The code may be placed into separate source code directories
  + by language, as in src/java/ and src/php/ for source code in the Java
  + and PHP languages respectively. Other projects may separate the code
  + according to function (src/share, src/testcases, src/compat). It is 
  + highly recomended that sub-directories be used under src/.</p>
  +
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                src/xdocs/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Documentation files in XML format.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                The Jakarta site uses Velocity/Anakia or Stylebook to transform 
  + dcumentation files in XML into HTML. The generated HTML files automatically 
  + inherit the Jakarta look-and-feel. Documentation is <a href="./jakarta-site2.html">available</a>.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                docs/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Documentation files intended for the end user.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                The docs/ directory contain most of the documentation for the
  + Jakarta sub-project. This includes Velocity/Anakia or Stylebook 
  + generated HTML files. This directory may also contain other 
  + documentation files. Generally, all documentation is stored in the 
  + src/xdocs/ directory and then "transformed" into this directory. 
  + 
  + It is then checked into
  + CVS and checked out of CVS on the live website. This allows the user
  + to browse the documentation on the local host without requiring
  + network connectivity as well as on the live website. Alternatively 
  + some projects may place 
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                NO
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                docs/ or www/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Web site documentation.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Some projects choose to check in documentation for their website 
  + to ease maintanence of site. This may be a superset of the documentation
  + included in the documentation provided in distributions. If the project
  + includes regular distributions then the website should be an image of 
  + documentation of last release. For projects that don't have regular releases
  + and whos website does not have highly volatile information (news, bug reports 
  + etc.) then it is acceptable to use docs/ subdirectory otherwise the www/ directory
  + is recomended. Once checked into the CVS it is expected that the documentation will
  + also be checked out on live website.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                www/index.html
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Starting point for browsing the documentation.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Browsing the documentation locally should yield the same results
  + as browsing the documentation on the sub-project home page on the
  + Jakarta web site.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                docs/api
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                API documentation as generated by the Javadoc tool.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Placing the API documenation under docs/api/ makes it slightly
  + easier for other documentation files under docs/ to reference API
  + documentation and vice versa. It is not recommended to check this
  + into CVS. At some point, we will have the <a href="http://jakarta.apache.org/alexandria/">Alexandria</a> project
  + building the documentation for all of the Jakarta Projects and making
  + the API documentation available that way.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                NO
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                tools/ or build/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Files required for building the sub-project.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Building includes compiling source code, generating javadoc
  + documentation, the creation of jar files and the distribution files
  + in tar.gz or zip formats.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                build.xml or build/build.xml
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                The ANT build script.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                All Jakarta projects are required to use ANT as their build tool.
  + Note, it is allowable to place this file at the top level directory
  + structure.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                build.sh build.bat
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Shell scripts for Unix and DOS environments to bootstrap the ANT
  + build process.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                The existence of these files implies the existence of binary jar
  + files, such as ant.jar and xerces.jar under CVS control
  + Note, it is allowable to place the shell scripts in subdirectory build/.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                tools/lib or build/lib/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Binary jar files required for building the sub-project.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                The jar files are added to the classpath by the bootstrapping
  + shell scripts before invoking ANT. The jar files should consist of
  + ant.jar as well as jar files needed for XML parsing.  
  +
  + <p>The tools/lib/ or build/lib/ directory should contain jar files needed during
  + build time and during build time only. If an XML parser
  + is also required during the runtime of the project, then the jar
  + files for the parser should be placed under dist/lib/.</p>
  +
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                dist/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                This directory is an image of the distribution files. Hence why it is called "dist" (short 
  + for distribution).
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                The contents of the dist/ directory should be enough to use the
  + project. The particular format of distribution is project dependent. Some may generate
  + a project.jar and a README while others may have dist the image of a .war file. It is 
  + commong to have dist/bin for scripts and dist/lib for jars related to runtime.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                NO
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                bin/ or build/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Intermediate files files generated while building the project.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                <p>It is to this directory that intermediate files are generated.
  + Different types are generally generated to sub-directories (ie .class files
  + stored in bin/classes, build/classes, .jar files in bin/lib or build/lib.</p>
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                NO
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                distributions/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                This directory contains the project release distributions. These are often
  + project.tar.gz, project.zip, project.rpm or project.war format.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                
  + <p>There are generally two forms of releases. Binary releases and
  + source releases. Binary releases consist of all the components end-users 
  + require to use the product. This may include jars and generated documentation.</p>
  +
  + <p>A source release generally includes an image of CVS repository. Files excluded
  + include any proposals/ or whiteboard/ code and the www/ directory. The source 
  + release will often include generated documentation.</p>
  +
  + <p>This directory is meaningful only to release managers. End-user
  + should be oblivious to it.</p>
  +
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                NO
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                contribs/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Contributions not officially part of the sub-project.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
                   &nbsp;
               </font>
   </td>
                                   <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                whiteboard/ or proposals/
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                Revolutions and other untested code bases.
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
  +                It is here where developers will host revolutions, forks and other deviations of codebase.
  + 
  +            </font>
  +</td>
  +                                <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                YES
  +            </font>
  +</td>
  +            </tr>
               </table>
                               </blockquote>
         </td></tr>
  
  
  
  1.43      +9 -1      jakarta-site2/docs/site/news.html
  
  Index: news.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/news.html,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- news.html	2001/04/03 04:18:31	1.42
  +++ news.html	2001/04/03 06:41:01	1.43
  @@ -131,7 +131,15 @@
         </td></tr>
         <tr><td>
           <blockquote>
  -                                    <h3>2 April 2001 - Velocity 1.0 Released</h3>
  +                                    <h3>2 April 2001 - Tomcat 4.0-beta-3 Released</h3>
  +                                                <p>
  +<strong>Tomcat 4.0-beta-3</strong> is an update to the Tomcat 4.0-beta-2
  +distribution that was released on 30 March 2001.  It fixes a further security
  +vulnerability that was not completely repaired in the beta 2 release.  Anyone
  +who has downloaded Tomcat 4.0-beta-2 should immediately update to this
  +version.
  +</p>
  +                                                <h3>2 April 2001 - Velocity 1.0 Released</h3>
                                                   <p>
     The Velocity project is proud to announce that
     the the Velocity Template Engine version 1.0 is now 
  
  
  
  1.15      +728 -20   jakarta-site2/docs/site/proposal.html
  
  Index: proposal.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/proposal.html,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- proposal.html	2001/04/03 04:18:31	1.14
  +++ proposal.html	2001/04/03 06:41:01	1.15
  @@ -143,106 +143,814 @@
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong>Project Guidelines</strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +
  +  <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>
  +    </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>
  +
  +  <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>
  +
  +  </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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <hr width="50%" />
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="roles">Roles &amp; Responsibilities</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +  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>
  +  When a user starts to contribute code or documentation patches, they
  +  become a developer.
  +  </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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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><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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <hr width="50%" />
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="communication">Communication</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +  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>
  +  To join the mailing lists, see our <a href="http://jakarta.apache.org/site/mail.html">
  +  Mailing List</a> page.
  +  </p>
  +                                                <p>
  +  The Project's list fall into the following categories:
  +  </p>
  +                            </blockquote>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="communication/ann">Announcement Lists</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="communication/user">User Lists</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="communication/dev">Developer Lists</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="communication/commit">Commit Lists</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <hr width="50%" />
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="decisions">Decision Making</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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
  +                                                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>
  +                                                <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>
  +  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
  +  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
  +  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>
  +  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
  +  author is a Developer and not a Commit<font color="#800000">t</font>er, the primary author of what
  +  is being changed may also cast a binding vote on that issue</strike><strike>.</strike> <font color="#800000">When voting on an action item, the subproject's Committers may also include the word "binding" next to their vote, to simplify a tally
  +  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
  +  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.
  +                                    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>
  +
  +  <tr valign="top">
  +  <td width="50"><p><b>-1</b></p></td> <td>"No," "<font color="#800000">Disagree."</font></td>
  +  </tr>
  +
  +  </table>
  +                            </blockquote>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <hr />
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="source">Source Repositories</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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>
  +  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>
  +  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>
  +  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
  +  file includes information about release plans, a summary of code
  +  changes committed since the last release, a list of proposed changes
  +  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>
  +  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>
  +  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"
  +                                    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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +  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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <hr width="50%" />
                                                   <table>
                           <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +          <strong><a name="management">Project Management Committee Bylaws</a></strong>
  +      
  +            </font>
  +</td>
  +            </tr>
                                   <tr>
                           <td bgcolor="#a0ddf0" colspan="" rowspan="" valign="top" align="left">
       <font color="#000000" size="-1" face="arial,helvetica,sanserif">
  -                            </tr>
  +                
  +        <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">
  +  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
  +                                    </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">
  +  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">
  +  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">
  +  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>
  +      
  +            </font>
  +</td>
  +            </tr>
               </table>
                                                   <hr />
                               </blockquote>
  
  
  
  1.34      +2 -2      jakarta-site2/docs/site/sourceindex.html
  
  Index: sourceindex.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/sourceindex.html,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- sourceindex.html	2001/04/03 04:18:32	1.33
  +++ sourceindex.html	2001/04/03 06:41:01	1.34
  @@ -191,8 +191,8 @@
   <li><a href="/builds/jakarta-tomcat/release/v3.2.2-beta-1/src/">Tomcat 3.2.2 beta 1</a></li>
   <li><a href="/builds/jakarta-tomcat/release/v3.3-m2/src/">Tomcat 3.3
   Milestone 2</a></li>
  -<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b2/src/">Tomcat 4.0
  -beta 2</a></li>
  +<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b3/src/">Tomcat 4.0
  +beta 3</a></li>
   </ul>
                                                   <h2>
   Nightly Builds (May not compile or even run)
  
  
  
  1.50      +13 -0     jakarta-site2/docs/site/whoweare.html
  
  Index: whoweare.html
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/docs/site/whoweare.html,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- whoweare.html	2001/04/03 04:18:32	1.49
  +++ whoweare.html	2001/04/03 06:41:01	1.50
  @@ -353,6 +353,19 @@
   Antidote, the GUI for Ant.
   </p>
                                                   <p>
  +<b>Santiago Gala</b> (sgala at hisitech.com or sgala at apache.org)
  +<br />
  +Santiago owns <a href="http://hisitech.com">High Sierra Technology</a>.
  +Works in a problem stated by his daughter Julia:
  + <em>
  +"Dad, you give the programs for free, how do you make the money?"
  +</em>
  +Free Software user after finding emacs in a tape, back in 91,
  + recently discovered the pleasure to make it happen :-).
  + Code contributor to Jetspeed, and  noise contributor
  + elsewhere.
  +</p>
  +                                                <p>
   <b><a href="http://rpmized.free.fr/">Henri Gomez</a></b> (hgomez at slib.fr)
   <br /> 
   Henri is a Software Engineer and Team Leader at SLIB where he works on
  
  
  
  1.28      +2 -2      jakarta-site2/xdocs/site/binindex.xml
  
  Index: binindex.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/binindex.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- binindex.xml	2001/04/02 18:41:33	1.27
  +++ binindex.xml	2001/04/03 06:41:03	1.28
  @@ -85,8 +85,8 @@
   <li><a href="/builds/jakarta-tomcat/release/v3.2.2-beta-2/bin/">Tomcat 3.2.2 beta 2</a></li>
   <li><a href="/builds/jakarta-tomcat/release/v3.3-m2/bin/">Tomcat 3.3
   Milestone 2</a></li>
  -<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b2/">Tomcat 4.0 beta
  -2</a></li>
  +<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b3/">Tomcat 4.0 beta
  +3</a></li>
   </ul>
   
   <h2>
  
  
  
  1.29      +10 -0     jakarta-site2/xdocs/site/news.xml
  
  Index: news.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/news.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- news.xml	2001/04/02 04:56:54	1.28
  +++ news.xml	2001/04/03 06:41:03	1.29
  @@ -11,6 +11,16 @@
   
     <section name="News &amp; Status">
   
  +<h3>2 April 2001 - Tomcat 4.0-beta-3 Released</h3>
  +
  +<p>
  +<strong>Tomcat 4.0-beta-3</strong> is an update to the Tomcat 4.0-beta-2
  +distribution that was released on 30 March 2001.  It fixes a further security
  +vulnerability that was not completely repaired in the beta 2 release.  Anyone
  +who has downloaded Tomcat 4.0-beta-2 should immediately update to this
  +version.
  +</p>
  +
   <h3>2 April 2001 - Velocity 1.0 Released</h3>
   
   <p>
  
  
  
  1.17      +2 -2      jakarta-site2/xdocs/site/sourceindex.xml
  
  Index: sourceindex.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-site2/xdocs/site/sourceindex.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- sourceindex.xml	2001/03/31 05:16:09	1.16
  +++ sourceindex.xml	2001/04/03 06:41:03	1.17
  @@ -81,8 +81,8 @@
   <li><a href="/builds/jakarta-tomcat/release/v3.2.2-beta-1/src/">Tomcat 3.2.2 beta 1</a></li>
   <li><a href="/builds/jakarta-tomcat/release/v3.3-m2/src/">Tomcat 3.3
   Milestone 2</a></li>
  -<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b2/src/">Tomcat 4.0
  -beta 2</a></li>
  +<li><a href="/builds/jakarta-tomcat-4.0/release/v4.0-b3/src/">Tomcat 4.0
  +beta 3</a></li>
   </ul>
   
   <h2>