You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/11/06 23:38:43 UTC

svn commit: r471906 - in /struts: current/STATUS.txt site/src/site/xdoc/announce.xml site/src/site/xdoc/download.xml site/src/site/xdoc/downloads.xml site/src/site/xdoc/index.xml site/src/site/xdoc/volunteers.xml struts2/trunk/src/site/xdoc/index.xml

Author: husted
Date: Mon Nov  6 14:38:42 2006
New Revision: 471906

URL: http://svn.apache.org/viewvc?view=rev&rev=471906
Log:
WW-1453 Update site for Struts 2.0.1 BETA release, which was submitted for mirroring at noon EST today, so the links will need to be updated tomorrow afternoon. Likewise, the announcement is post-dated for uploading to the site tomorrow.

Modified:
    struts/current/STATUS.txt
    struts/site/src/site/xdoc/announce.xml
    struts/site/src/site/xdoc/download.xml
    struts/site/src/site/xdoc/downloads.xml
    struts/site/src/site/xdoc/index.xml
    struts/site/src/site/xdoc/volunteers.xml
    struts/struts2/trunk/src/site/xdoc/index.xml

Modified: struts/current/STATUS.txt
URL: http://svn.apache.org/viewvc/struts/current/STATUS.txt?view=diff&rev=471906&r1=471905&r2=471906
==============================================================================
--- struts/current/STATUS.txt (original)
+++ struts/current/STATUS.txt Mon Nov  6 14:38:42 2006
@@ -14,10 +14,7 @@
     * Cedric Dumoulin (cedric at apache.org)
     * Martin Cooper, Vice President and Chair (martinc at apache.org)
     * James Holmes (jholmes at apache.org)
-    * David M. Karr (dmkarr at apache.org)
-    * David Graham (dgraham at apache.org)
     * James Mitchell (jmitchell at apache.org)
-    * Steve Raeburn (sraeburn at apache.org)
     * Don Brown (mrdon at apache.org)
     * Joe Germuska (germuska at apache.org)
     * Niall Pemberton (niallp at apache.org)
@@ -26,6 +23,14 @@
     * Gary VanMatre (gvanmatre at apache.org)
     * Sean Schofield (schof at apache.org)
     * Greg Reddin (greddin at apache.org)
+    * Laurie Harper  (laurieh at apache.org)
+    * Jason Carreira (jcarreira at apache.org)
+    * Patrick Lightbody (plightbo at apache.org)
+    * Alexandru Popescu (apopescu at apache.org)
+    * Rene Gielen (rgielen at apache.org)
+    * Rainer Hermanns (hermanns at apache.org)
+    * Toby Jee (tmjee at apache.org)
+    * Ian Roughley (roughley at apache.org) 
 
 Other Active Committers
 
@@ -42,6 +47,12 @@
     * Toby Jee (tmjee at apache.org)
     * Ian Roughley (roughley at apache.org)
 
+Emeritus PMC Members
+
+    * David M. Karr (dmkarr at apache.org)
+    * David Graham (dgraham at apache.org)
+    * Steve Raeburn (sraeburn at apache.org)
+
 Emeritus Committers 
 
     * Luis Arias
@@ -59,6 +70,53 @@
 
 2006 Board Reports 
 
+
+October 2006 -- Struts 2 Beta
+
+Much of the focus in this quarter has been in driving Struts 2 forward, 
+with help from a growing number of contributors. Struts 2.0.1 was elevated 
+from a development build to a Beta release shortly after ApacheCon, thus 
+marking our first public release in the Struts 2 family. We also have a 
+snazzy new logo that signals the integration of Struts and WebWork into 
+Struts 2!
+
+Activity has also increased on Tiles 2 (a.k.a. Standalone Tiles), as this 
+moves towards its first release, and development continues on the 
+Struts 1.3.x line, with the General Availability (GA) release of 
+Struts 1.3.5 in this quarter.
+
+The Struts team made the most of ApacheCon US this year. Both a tutorial 
+and a session on Struts 2 were offered, as well as a Struts BOF. We also 
+took advantage of the opportunity to create a press release announcing our 
+Struts 2.0.1 development build, since this is a significant milestone, 
+bringing together two successful web frameworks, together with their 
+respective communities, into a coherent whole.
+
+Consistent with the increase in activity, and with the unification of the 
+Struts and WebWork communities, we have added eight people to the PMC this 
+quarter, namely Patrick Lightbody, Jason Carreira, Laurie Harper, Alexandru 
+Popescu, Rene Gielen, Rainer Hermanns, Toby Jee, and Ian Roughley. We have 
+also added three new committers: Antonio Petrelli, Nils-Helge Garli, and 
+David DeWolf. 
+
+
+July 2006 -- Shale graduates
+
+Since our April 2006 report, our former subproject Shale has graduated to a
+top-level project. Our WebWork 2 podling also graduated from the incubator and
+has become the basis of Struts 2. Meanwhile, Struts 1 has released three beta
+releases - 1.3.2, 1.3.3, and 1.3.4 - and a Struts 1.3.5 test build is available
+and proceeding toward a release quality vote. A Struts 2.0.0 distribution is
+expected next month. The new Maven builds are working well, despite the
+complexity of our distributions.
+
+Three new committers have joined the fold: Paul Benedict, Michael Jouravlev, and
+Bob Lee. Paul and Michael are longtime members of the Struts 1 use community,
+and helped us provide new features and fixes for the Struts 1.2.9 release. Bob
+Lee is a longtime member of the WebWork 2 user community and helped us prepare a
+short list of changes for the Struts 2.0.0 distribution.
+
+
 April 2006 -- WebWork2 podling
 
 The last quarter has seen the creation of the WebWork 2 podling and rapid progress. 
@@ -96,7 +154,7 @@
 frameworks
 
 
-April 2006 
+April 2006 -- Shale and Action Builds
 
 The Struts community has been a busy one this last quarter. In terms of
 releases, we released Struts 1.2.9, primarily to fix a reported
@@ -117,7 +175,7 @@
 Ian Roughley) as part of bringing WebWork 2 into the fold.
 
 
-January 2006
+January 2006 -- WebWork Merger
 
 The last quarter has been an eventful one in the Struts community. In
 terms of releases, we released Struts 1.2.8, primarily to fix an XSS
@@ -143,6 +201,12 @@
 ----
 
 2006 PROJECT VOTES AND DECISIONS
+
+Struts 2.0.1 Quality 
+* [20 Oct 2006] +5 GA (binding), +2 (supporting)
+
+Struts v1.3.5 Quality (2)
+* [14 Sep 2006] 6 +1 (binding); 3 +1 (non-binding)
 
 Struts v1.3.5 Quality
 * [17 Aug 2006] +2 GA (binding), +2 Beta (binding), +2 GA (non-binding)

Modified: struts/site/src/site/xdoc/announce.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?view=diff&rev=471906&r1=471905&r2=471906
==============================================================================
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Mon Nov  6 14:38:42 2006
@@ -30,6 +30,129 @@
                 Skip to: <a href="announce-2005.html">Announcements - 2005</a>
             </p>
             
+            <h4 id="a20061107">07 Nov 2006 - Struts v2.0.1 BETA Release</h4>
+            
+            <p>
+            The Apache Struts project is pleased to announce the availability of 
+            the <a href="http://struts.apache.org/download.cgi#struts201">
+            Struts 2.0.1 BETA release</a>. 
+            </p>
+            
+            <p>
+            Apache Struts 2 is an elegant, extensible framework, well suited for 
+            enterprise-ready Java web applications. 
+            The framework is designed to streamline the full development cycle, 
+            from building, to deploying, to maintaining applications over time.
+            </p>
+            
+            <p>
+            Apache Struts 2 was originally known as WebWork 2. 
+            After working independently for several years, 
+            the WebWork and Struts communities joined forces to create Struts<sup>2</sup>. 
+            This new version of Struts is simpler to use and closer to how 
+            Struts was always meant to be. 
+            </p>
+            
+            <ul>
+            <li>
+                <em>Build!</em> 
+                <ul>
+                <li>
+                    <strong>Easy startup</strong> - A Maven archetype, template application, and bootstrap 
+                    tutorial help jumpstart new projects.               
+                </li>
+                <li>
+                    <strong>Improved Design</strong> - All framework classes are based on interfaces. 
+                    Core interfaces are HTTP independent.
+                </li>
+                <li>
+                    <strong>Enhanced Results</strong> - Unlike ActionForwards, Struts<sup>2</sup> Results can
+                    actually help prepare the response. 
+                </li>
+                <li>
+                    <strong>Enhanced Tags</strong> - Struts<sup>2</sup> tags don't just output data, but provide 
+                    stylesheet-driven markup, so that we can create consistent pages with less code.
+                </li>
+                <li>
+                    <strong>Stateful Checkboxes</strong> - Struts<sup>2</sup> checkboxes do not require special 
+                    handling for false values.
+                </li>
+                <li>
+                    <strong>Easy cancel handling</strong> - The Struts<sup>2</sup> Cancel button can go directly to 
+                    a different action. 
+                </li>
+                <li>
+                    <strong>POJO forms</strong> - No more ActionForms! We can use any JavaBean we like or 
+                    put properties directly on our Action classes. No need to use all String properties! 
+                </li>
+                <li>
+                    <strong>POJO Actions</strong> - Any class can be used as an Action class. Even the 
+                    interface is optional! 
+                </li>
+                <li>
+                    <strong>Easy Spring integration</strong> - Struts<sup>2</sup> Actions are Spring-aware. Just 
+                    add Spring beans!
+                </li>
+                <li>
+                    <strong>First-class AJAX support</strong> - The AJAX theme gives interactive 
+                    applications a boost. 
+                </li>
+                </ul></li>
+
+                <li>
+                    <em>Deploy!</em> 
+                <ul>
+                <li>
+                    <strong>QuickStart</strong> - Configuration files are reloadable so many changes 
+                    can be made on the fly without restarting a web container. 
+                </li>
+                <li>
+                    <strong>Easy plugins</strong> - Framework extensions can be added by dropping in a JAR. 
+                    No manual configuration required! Bundled plugins add support for JavaServer Faces, 
+                    JasperReports, JFreeChart, Tiles, and more ...
+                </li>
+                <li>
+                    <strong>Easy portlets</strong> - Automatic portlet support allows portal and servlet 
+                    deployments with no code changes.
+                </li>
+
+                </ul></li>
+                <li>
+                <em>Maintain!</em> 
+                <ul>
+                <li>
+                    <strong>Easy-to-test Actions</strong> - Struts<sup>2</sup> Actions are HTTP independent and 
+                    can be tested without resorting to mock objects. 
+                </li>
+                <li>
+                    <strong>Intelligent Defaults</strong> - Most framework configuration elements have a default 
+                    value that we can set and forget. 
+                </li>
+                <li>
+                    <strong>Easy-to-customize controller</strong> - Struts 1 lets us customize the request 
+                    processor per module, Struts<sup>2</sup> lets us customize the request handling 
+                    per action, if desired. 
+                </li>
+                <li>
+                    <strong>Easy-to-tweak tags</strong> - Struts<sup>2</sup> tag markup can be altered by changing 
+                    an underlying stylesheet. Individual tag markup can be changed by 
+                    editing a FreeMarker template. No need to grok the taglib API!
+                    <em>JSP, FreeMarker, and Velocity tags are fully supported.</em>
+                </li>
+                <li>
+                    <strong>Integrating Debugging</strong> - Built-in debugging tools supporting profiling, 
+                    problem reports, and interactive object model queries.
+                </li>
+                </ul></li></ul>                                
+            <p>
+            For more,  
+            <a href="http://struts.apache.org/2.x/">
+              visit the Apache Struts 2 website.
+            </a>
+            </p>
+            <hr/>
+
+
             <h4 id="a20061020.1">20 Oct 2006 - New Struts Committer: David DeWolf</h4>            
             <p>
             Please join us in welcoming David DeWolf as a new Struts committer. 
@@ -54,7 +177,7 @@
             
             <p>
             The Apache Struts project is pleased to announce the availability of 
-            the <a href="http://cwiki.apache.org/WW/home.html#Home-Distributions">
+            the <a href="http://struts.apache.org/download.cgi#struts201">
             Struts 2.0.1 development build</a>. 
             </p>
             

Modified: struts/site/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/download.xml?view=diff&rev=471906&r1=471905&r2=471906
==============================================================================
--- struts/site/src/site/xdoc/download.xml (original)
+++ struts/site/src/site/xdoc/download.xml Mon Nov  6 14:38:42 2006
@@ -24,22 +24,19 @@
 
     <body>
 
+        <a name="download"/>
         <section name="Download Struts">
-            <a name="download"/>
 
             <p>
                 Use the links below to download Apache Struts from one of our
-                mirrors.
-                You
-                <strong>must</strong>
+                mirrors. You can 
                 <a href="#verify">verify the integrity</a>
                 of the downloaded files using signatures downloaded from our
-                main
-                distribution directory.
+                main distribution directory.
             </p>
 
+            <a name="mirror"/>
             <subsection name="Mirror">
-                <a name="mirror"/>
 
                 <p>
                     [if-any logo]
@@ -49,8 +46,7 @@
                     </a>
                     [end]
                     The currently selected mirror is
-                    <b>[preferred]</b>
-                    .
+                    <b>[preferred]</b>.
                     If you encounter a problem with this mirror,
                     please select another mirror.
                     If all mirrors are failing, there are
@@ -84,22 +80,22 @@
                 <p>
                     You may also consult the
                     <a href="http://www.apache.org/mirrors/">complete list of
-                        mirrors</a>
-                    .
+                        mirrors.</a>
                 </p>
 
             </subsection>
 
         </section>
 
+        <a name="struts-ga"/>
         <section name="Full Releases">
-            <a name="struts-ga"/>
 
             <a name="struts135"/>
             <subsection name="Struts 1.3.5">
 
                 <p>
-                    Struts 1.3.5 is the latest production release of Struts.
+                    <a href="http://struts.apache.org/1.x/index.html">Struts 1.3.5</a> 
+                    is the latest production release of Struts.
                     It is available in a full distribution, or as
                     separate library, source, example and documentation
                     distributions.
@@ -165,7 +161,8 @@
             <subsection name="Struts 1.2.9">
 
                 <p>
-                    Struts 1.2.9 is a prior production release of Struts.
+                    <a href="http://struts.apache.org/1.2.9/index.html">Struts 1.2.9</a> 
+                    is a prior production release of Struts.
                     It is available in a binary distribution, a source
                     distribution,
                     and a minimal library distribution.
@@ -261,106 +258,117 @@
                     </li>
 
                 </ul>
-
             </subsection>
 
-            <a name="struts-scripting-101"/>
-            <subsection name="Struts Scripting 1.0.1">
+            <a name="strutsarchive"/>
+            <subsection name="Older Releases">
 
                 <p>
-                    Struts Scripting 1.0.1 is the latest production release of
-                    Struts Scripting.
-                    It is available in a binary distribution and in a source
-                    distribution.
+                    Older versions of Struts are available from the
+                    <a href="http://archive.apache.org/dist/struts/">Archive
+                        Site.</a>
                 </p>
 
+            </subsection>
+        </section>
+
+        <a name="struts-beta"/>
+        <section name="Beta Releases">
+
+            <a name="struts201"/>
+            <subsection name="Struts 2.0.1">
+            
+            <p>       
+             <a href="http://struts.apache.org/2.x/">Apache Struts 2</a> 
+             is an elegant, extensible framework, well suited 
+             for creating enterprise-ready Java web applications. 
+             It is available in a full distribution, or as
+             separate library, source, example and documentation
+             distributions.
+            </p>            
+
                 <ul>
 
-                    <li>Binaries:
+                    <li>Full Distribution:
                         <ul>
                             <li>
-                                <a href="[preferred]/struts/scripting/binaries/struts-scripting-1.0.1.zip">
-                                    struts-scripting-1.0.1.zip</a>
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/binaries/struts-scripting-1.0.1.zip.asc">
-                                    PGP</a>
-                                ]
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/binaries/struts-scripting-1.0.1.zip.md5">
-                                    MD5</a>
-                                ]
+                                <a href="http://www.apache.org/dist/struts/binaries/struts-2.0.1-all.zip">struts-2.0.1-all.zip</a> (43mb)
+                                [<a href="http://www.apache.org/dist/struts/binaries/struts-2.0.1-all.zip.asc">PGP</a>]
+                                [<a href="http://www.apache.org/dist/struts/binaries/struts-2.0.1-all.zip.md5">MD5</a>]
                             </li>
+                        </ul>
+                    </li>
+
+                    <li>Example Applications:
+                        <ul>
                             <li>
-                                <a href="[preferred]/struts/scripting/binaries/struts-scripting-1.0.1.tar.gz">
-                                    struts-scripting-1.0.1.tar.gz</a>
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/binaries/struts-scripting-1.0.1.tar.gz.asc">
-                                    PGP</a>
-                                ]
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/binaries/struts-scripting-1.0.1.tar.gz.md5">
-                                    MD5</a>
-                                ]
+                                <a href="http://www.apache.org/dist/struts/examples/struts-2.0.1-apps.zip.asc/struts/examples/struts-2.0.1-apps.zip">struts-2.0.1-apps.zip</a> (22mb)
+                                [<a href="http://www.apache.org/dist/struts/examples/struts-2.0.1-apps.zip.asc">PGP</a>]
+                                [<a href="http://www.apache.org/dist/struts/examples/struts-2.0.1-apps.zip.md5">MD5</a>]
                             </li>
                         </ul>
                     </li>
 
-                    <li>Source:
+                    <li>Blank Application:
                         <ul>
                             <li>
-                                <a href="[preferred]/struts/scripting/source/struts-scripting-1.0.1-src.zip">
-                                    struts-scripting-1.0.1-src.zip</a>
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/source/struts-scripting-1.0.1-src.zip.asc">
-                                    PGP</a>
-                                ]
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/source/struts-scripting-1.0.1-src.zip.md5">
-                                    MD5</a>
-                                ]
+                                <a href="http://www.apache.org/dist/struts/examples/struts2-blank-2.0.1.war">struts2-blank-2.0.1.war</a> (Also included in apps.) (3mb)
+                                [<a href="http://www.apache.org/dist/struts/examples/struts2-blank-2.0.1.war.asc">PGP</a>]
+                                [<a href="http://www.apache.org/dist/struts/examples/struts2-blank-2.0.1.war.md5">MD5</a>]
                             </li>
+                        </ul>
+                    </li>
+
+                    <li>Essential Dependencies Only:
+                        <ul>
                             <li>
-                                <a href="[preferred]/struts/scripting/source/struts-scripting-1.0.1-src.tar.gz">
-                                    struts-scripting-1.0.1-src.tar.gz</a>
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/source/struts-scripting-1.0.1-src.tar.gz.asc">
-                                    PGP</a>
-                                ]
-                                [
-                                <a href="http://www.apache.org/dist/struts/scripting/source/struts-scripting-1.0.1-src.tar.gz.md5">
-                                    MD5</a>
-                                ]
+                                <a href="http://www.apache.org/dist/struts/library/struts-2.0.1-lib.zip">struts-2.0.1-lib.zip</a> (3mb)
+                                [<a href="http://www.apache.org/dist/struts/library/struts-2.0.1-lib.zip.asc">PGP</a>]
+                                [<a href="http://www.apache.org/dist/struts/library/struts-2.0.1-lib.zip.md5">MD5</a>]
                             </li>
                         </ul>
                     </li>
-                </ul>
-
-            </subsection>
-            <a name="strutsarchive"/>
-            <subsection name="Older Versions">
-
-                <p>
-                    Older versions of Struts are available from the
-                    <a href="http://archive.apache.org/dist/struts/">Archive
-                        Site</a>
-                    .
-                </p>
 
-            </subsection>
-        </section>
+                    <li>Documentation:
+                        <ul>
+                            <li>
+                                <a href="http://www.apache.org/dist/struts/documentation/struts-2.0.1-docs.zip">struts-2.0.1-docs.zip</a> (11mb)
+                                [<a href="http://www.apache.org/dist/struts/documentation/struts-2.0.1-docs.zip.asc">PGP</a>]
+                                [<a href="http://www.apache.org/dist/struts/documentation/struts-2.0.1-docs.zip.md5">MD5</a>]
+                            </li>
+                        </ul>
+                    </li>
+                    
+                    <li>Source:
+                        <ul>
+                            <li>
+                                <a href="http://www.apache.org/dist/struts/source/struts-2.0.1-src.zip">struts-2.0.1-src.zip</a> (18mb)
+                                [<a href="http://www.apache.org/dist/struts/source/struts-2.0.1-src.zip.asc">PGP</a>]
+                                [<a href="http://www.apache.org/dist/struts/source/struts-2.0.1-src.zip.md5">MD5</a>]
+                            </li>
+                        </ul>
+                    </li>
 
-        <section name="Beta Releases">
-            <a name="struts-beta"/>
+                    <li>Alternative Java 4 JARs:
+                        <ul>
+                            <li>
+                                <a href="http://www.apache.org/dist/struts/binaries/struts-2.0.1-j4.zip">struts-2.0.1-j4.zip</a> (2mb)
+                                [<a href="http://www.apache.org/dist/struts/binaries/struts-2.0.1-j4.zip.asc">PGP</a>]
+                                [<a href="http://www.apache.org/dist/struts/binaries/struts-2.0.1-j4.zip.md5">MD5</a>]
+                            </li>
+                        </ul>
+                    </li>
 
-            <p>None at this time.</p>
+                </ul>
 
+            </subsection>    
         </section>
 
         <section name="Verify the integrity of the files" href="verify">
         <a name="verify"/>
 
             <p>
-                It is essential that you verify the integrity of the
+                We recommend that you verify the integrity of the
                 downloaded files using the PGP or MD5 signatures.
             </p>
 
@@ -374,8 +382,8 @@
                 distribution.
                 Make sure you get these files from the
                 <a href="http://www.apache.org/dist/struts/">main distribution
-                    directory</a>
-                , rather than from a mirror.
+                    directory,</a>
+                rather than from a mirror.
                 Then verify the signatures using
             </p>
 
@@ -413,19 +421,16 @@
                 included in many Unix distributions.
                 It is also available as part of
                 <a href="http://www.gnu.org/software/textutils/textutils.html">
-                    GNU
-                    Textutils</a>
-                . Windows users can get binary md5 programs from
-                <a href="http://www.fourmilab.ch/md5/">here</a>
-                ,
+                    GNU Textutils.</a>
+                Windows users can get binary md5 programs from
+                <a href="http://www.fourmilab.ch/md5/">here,</a>
                 <a href="http://www.pc-tools.net/win32/freeware/console/">
-                    here</a>
-                , or
-                <a href="http://www.slavasoft.com/fsum/">here</a>
-                .
+                    here,</a>
+                or
+                <a href="http://www.slavasoft.com/fsum/">here.</a>
             </p>
 
         </section>
-
+        
     </body>
 </document>

Modified: struts/site/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/downloads.xml?view=diff&rev=471906&r1=471905&r2=471906
==============================================================================
--- struts/site/src/site/xdoc/downloads.xml (original)
+++ struts/site/src/site/xdoc/downloads.xml Mon Nov  6 14:38:42 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+                              <?xml version="1.0"?>
 <!--
 Copyright 1999-2006 The Apache Software Foundation
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,11 +19,11 @@
 <document>
 
     <properties>
-        <title>Downloads</title>
+        <title>Distributions</title>
     </properties>
 
     <body>
-        <section name="Apache Struts Downloads">
+        <section name="Apache Struts Distributions">
 
             <p>
                 The Apache Struts framework is available to the public 
@@ -41,13 +41,11 @@
                 <a href="http://ibiblio.org">ibiblio.</a>
             </p>
 
+            <a name="ReleasesAndMilestones"/>
             <subsection name="Releases and Milestone Builds">
-                <a name="ReleasesAndMilestones"/>
                 <p>
                     Releases and milestone builds of Apache Struts products are
-                    available from
-                    our distribution site, or from mirror
-                    sites.
+                    available from our distribution site, or from mirror sites.
                 </p>
                 <ul>
                     <li>
@@ -59,12 +57,12 @@
                                 </a>
                             </li>
                             <li>
-                                <a href="http://struts.apache.org/download.cgi">
+                                <a href="http://struts.apache.org/download.cgi#struts129">
                                     Struts 1.2.9
                                 </a>
                             </li>
                             <li>
-                                <a href="http://struts.apache.org/download.cgi">
+                                <a href="http://struts.apache.org/download.cgi#scripting101">
                                     Struts Scripting 1.0.1
                                 </a>
                             </li>
@@ -72,9 +70,11 @@
                     </li>
                     <li>
                         <strong>Beta Releases</strong>
-                        <ul>
-                            <li>None at this time.</li>
-                        </ul>
+                            <li>
+                                <a href="http://struts.apache.org/download.cgi#struts201">
+                                    Struts 2.0.1
+                                </a>
+                            </li>
                     </li>
                     <li>
                         <strong>Older Releases</strong>
@@ -170,8 +170,7 @@
                     To download the trunk (HEAD revision) of all Struts
                     subprojects,
                     a convenience directory has been added, named
-                    <b>current</b>
-                    .
+                    <b>current</b>.
                     The current directory uses a Subversion feature called
                     externals
                     which stores properties on the directory.
@@ -201,11 +200,9 @@
                     relative paths might not work the way you expect.
                     For more, see the
                     <a href="http://svnbook.red-bean.com/en/1.1/ch07s04.html">
-                        Externals
-                        Definitions</a>
+                        Externals Definitions</a>
                     section of the
-                    <a href="http://svnbook.red-bean.com/">Subversion Book</a>
-                    .
+                    <a href="http://svnbook.red-bean.com/">Subversion Book.</a>
                 </p>
 
 
@@ -300,6 +297,57 @@
 
             </subsection>
 
+        <subsection name="Maven Snapshots">
+        <p>
+            When a distribution is first made available, 
+            it is rated as a development build or "snapshot". 
+            Later, the quality of the distribution may be upgraded to "Beta" or 
+            "General Availability", based on feedback from the community, 
+            and then made available through ibiblio and other public Maven repositories. 
+            To obtain an early distribution via Maven, 
+            specify the ASF Snapshot repository in the project's POM. 
+        </p>
+        
+        <p><pre><code>
+        &lt;repositories>
+          &lt;repository>
+            &lt;id>apache.snapshots&lt;/id>
+            &lt;name>ASF Maven 2 Snapshot&lt;/name>
+            &lt;url>http://people.apache.org/repo/m2-snapshot-repository&lt;/url>
+          &lt;/repository>
+        &lt;/repositories>
+        </code></pre></p>
+
+        </subsection>                        
+        </section>
+
+        <section name="Licensing of Apache Struts Distributions">
+        <p>        
+            Apache Struts 2 source code and documentation is 
+            licensed to the Apache Software Foundation (ASF) under one
+            or more contributor license agreements. See the NOTICE file
+            included in distribution for additional information
+            regarding copyright ownership. The ASF licenses the source 
+            code and documentation files in our Apache Struts distribution 
+            to you under the Apache License, Version 2.0 (the "License"); 
+            you may not use the Apache Struts product except in compliance
+            with the License. 
+        </p>
+
+        <p>
+            You may obtain a copy of the License at
+            <a href="http://www.apache.org/licenses/LICENSE-2.0">
+            http://www.apache.org/licenses/LICENSE-2.0</a>.
+        </p> 
+
+        <p>
+            Unless required by applicable law or agreed to in writing,
+            software distributed under the License is distributed on an
+            "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+            KIND, either express or implied.  See the License for the
+            specific language governing permissions and limitations
+            under the License.  
+        </p> 
         </section>
 
         <section>

Modified: struts/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?view=diff&rev=471906&r1=471905&r2=471906
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Mon Nov  6 14:38:42 2006
@@ -28,14 +28,26 @@
         <section name="Recent Releases">
         
         <p>
-            Visit the <a href="downloads.html">downloads</a> page for links to other releases and distributions, including development builds of <a href="2.x/index.html">Struts 2</a>.            
+            Visit the <a href="downloads.html">Distributions</a> page for links to other releases and distributions.            
         </p>
+        
+            <a name="2.0.1"/>
+            <subsection name="Struts 2.0.1 BETA Available">
+
+            <p>
+             <a href="http://struts.apache.org/2.x/">Apache Struts 2</a> 
+             is an elegant, extensible framework, well suited 
+             for creating enterprise-ready Java web applications. 
+             Struts 2.0.1 was promoted to "Beta" quality on 20 October 2006.
+            </p>
 
+            </subsection>
+            
             <a name="1.3.5"/>
             <subsection name="Struts 1.3.5 Released">
 
             <p>
-                The best available version of Struts is
+                The <strong>best available</strong> version of Struts is
                 <a href="download.cgi#struts135">Struts 1.3.5</a>,
                 which was promoted to "General Availability"
                 (or "Ready for Primetime") on 17 September 2006.
@@ -174,11 +186,10 @@
             </p>
                         
             <p>
-                Struts 2 is still under construction. An initial release is 
-                expected in the third quarter of 2006. Snapshot builds of 
-                <a href="downloads.html">
-                <strong>Struts 2</strong>/a> are now available for 
-                early testing.
+                A stable release of Struts 2 is expected in the fourth 
+                quarter of 2006. 
+                An intitial <a href="downloads.html">BETA release</a> 
+                is now available.
             </p>
                         
             <p>
@@ -188,8 +199,6 @@
                 my next project?".</a>
              </p>
        </section>
-          
-
 
         <section>
             <a name="shale"/>

Modified: struts/site/src/site/xdoc/volunteers.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/volunteers.xml?view=diff&rev=471906&r1=471905&r2=471906
==============================================================================
--- struts/site/src/site/xdoc/volunteers.xml (original)
+++ struts/site/src/site/xdoc/volunteers.xml Mon Nov  6 14:38:42 2006
@@ -87,16 +87,6 @@
                     </li>
 
                     <li>
-                        <strong>David M. Karr</strong>
-                        (dmkarr at apache.org)
-                    </li>
-
-                    <li>
-                        <strong>David Graham</strong>
-                        (dgraham at apache.org)
-                    </li>
-
-                    <li>
                         <strong>James Mitchell</strong>
                         (jmitchell at apache.org)
                     </li>
@@ -210,15 +200,30 @@
             </subsection>
 
             <a name="emeritus"/>
-            <subsection name="Emeritus Committers">
+            <subsection name="Emeritus Volunteers">
             
             <p>
-            Emeritus committers are no longer active in the project. 
-            An emeritus committer can become active again upon request. 
+            Emeritus volunteers are no longer active in the project. 
+            An emeritus volunteers can become active again upon request. 
             ("Merit never expires.")
             </p>
             
                 <ul>
+                    <li>
+                        <strong>David M. Karr</strong> 
+                        (dmkarr at apache.org) (PMC) 
+                    </li>
+
+                    <li>
+                        <strong>David Graham</strong>
+                        (dgraham at apache.org) (PMC) 
+                    </li>
+
+                    <li>
+                        <strong>Steve Raeburn</strong> 
+                        (Steve Raeburn (sraeburn at apache.org) (PMC) 
+                    </li>
+
                     <li>Luis Arias</li>
 
                     <li>Pierre Delilse</li>

Modified: struts/struts2/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/xdoc/index.xml?view=diff&rev=471906&r1=471905&r2=471906
==============================================================================
--- struts/struts2/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts2/trunk/src/site/xdoc/index.xml Mon Nov  6 14:38:42 2006
@@ -1,19 +1,5 @@
 <?xml version="1.0"?>
 <!--
-Copyright 1999-2005 The Apache Software Foundation
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!--
 // ======================================================================== 78
 -->
 <document>
@@ -32,7 +18,7 @@
         
         <p>       
          <strong>Apache Struts 2 is an elegant, extensible framework,</strong> well suited 
-         for creating moderate to large-scale Java web applications. 
+         for creating enterprise-ready Java web applications. 
          The framework is designed to streamline the full development cycle, 
          from building, to deploying, to maintaining applications over time.
         </p>     
@@ -47,7 +33,13 @@
         <p>
          For more about Apache Struts 2, visit
          <a href="http://cwiki.apache.org/WW/home.html">
-         Getting Started.
+            Getting Started.
+         </a>
+        </p>
+        <p>
+         To download Apache Struts 2, visit
+         <a href="http://struts.apache.org/downloads.html">
+            Apache Struts Distributions
          </a>
         </p>
         </div>
@@ -146,7 +138,8 @@
                     problem reports, and interactive object model queries.
                 </li>
                 </ul></li></ul>
-
+                
+            <subsection>
             <p>
             For more about Apache Struts 2, visit
             <a href="http://cwiki.apache.org/WW/home.html">
@@ -154,76 +147,43 @@
             </a>
             </p>
             
+            <p>
+            To download Apache Struts 2, visit
+            <a href="http://struts.apache.org/downloads.html">
+               Apache Struts Distributions
+            </a>
+            </p>
+            </subsection>
         </section> 
-        <section name="Distributions">
-
-        <ul><li>For your convenience, a one-stop <strong>all</strong> 
-        distribution is available. Individual elements of the distribution 
-        may also be downloaded separately.</li></ul>
         
-        <table>
-            <tr>
-            <td><a href="http://people.apache.org/builds/struts/2.0.1/struts-2.0.1-all.zip">all</a></td>
-            <td>The entire distribution, including all the elements. (43mb)</td>
-            </tr>
-            <tr>
-            <td><a href="http://people.apache.org/builds/struts/2.0.1/struts-2.0.1-apps.zip">apps</a></td>
-            <td>The example applications, as ready-to-deploy WARs. (22mb) </td>
-            </tr>
-            <tr>
-            <td><a href="http://people.apache.org/builds/struts/2.0.1/struts2-blank-2.0.1.war">blank</a></td>
-            <td>Just the blank application, ready to deploy as a template for new development. (Also included in apps.) (3mb)</td>
-            </tr>
-            <tr>
-            <td><a href="http://people.apache.org/builds/struts/2.0.1/struts-2.0.1-docs.zip">docs</a></td>
-            <td>The documentation, as provided on the website. (11mb)</td>
-            </tr>
-            <tr>
-            <td><a href="http://people.apache.org/builds/struts/2.0.1/struts-2.0.1-lib.zip">lib</a></td>
-            <td>The essential dependencies, including the Struts<sup>2</sup> JARs. (3mb)</td>
-            </tr>
-            <tr>
-            <td><a href="http://people.apache.org/builds/struts/2.0.1/struts-2.0.1-src.zip">src</a></td>
-            <td>The source code for the framework, ready to build as a Maven project. (18mb)</td>
-            </tr>
-            <tr>
-            <td><a href="http://people.apache.org/builds/struts/2.0.1/struts-2.0.1-j4.zip">sj4</a></td>
-            <td>The Java 1.4 versions of the Struts and XWork JARs (prepared using RetoTranslator). (2mb)</td>
-            </tr>
-         </table>
-            
-            <ul><li>The Struts<sup>2</sup> distributions are classified "test-build" quality but are suitable for new development by early adopters.</li></ul>
+        <section name="Licensing of Apache Struts Distributions">
+        <p>        
+            Apache Struts 2 source code and documentation is 
+            licensed to the Apache Software Foundation (ASF) under one
+            or more contributor license agreements. See the NOTICE file
+            included in distribution for additional information
+            regarding copyright ownership. The ASF licenses the source 
+            code and documentation files in our Apache Struts distribution 
+            to you under the Apache License, Version 2.0 (the "License"); 
+            you may not use the Apache Struts product except in compliance
+            with the License. 
+        </p>
 
-        <subsection name="Maven Snapshots">
         <p>
-            When a distribution is first made available, 
-            it is rated as a development build or "snapshot". 
-            Later, the quality of the distribution may be upgraded to "Beta" or 
-            "General Availability", based on feedback from the community, 
-            and then made available through ibiblio and other public Maven repositories. 
-            To obtain an early distribution via Maven, 
-            specify the ASF Snapshot repository in the project's POM. 
-        </p>
-        
-        <p><pre><code>
-        &lt;repositories>
-          &lt;repository>
-            &lt;id>apache.snapshots&lt;/id>
-            &lt;name>ASF Maven 2 Snapshot&lt;/name>
-            &lt;url>http://people.apache.org/repo/m2-snapshot-repository&lt;/url>
-          &lt;/repository>
-        &lt;/repositories>
-        </code></pre></p>
-                
+            You may obtain a copy of the License at
+            <a href="http://www.apache.org/licenses/LICENSE-2.0">
+            http://www.apache.org/licenses/LICENSE-2.0</a>.
+        </p> 
+
         <p>
-        For more about Apache Struts 2, visit
-        <a href="http://cwiki.apache.org/WW/home.html">
-          Getting Started.
-        </a>
-        </p>
+            Unless required by applicable law or agreed to in writing,
+            software distributed under the License is distributed on an
+            "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+            KIND, either express or implied.  See the License for the
+            specific language governing permissions and limitations
+            under the License.  
+        </p> 
         
-        </subsection>                        
         </section>        
-
     </body>
 </document>