Author: husted
Date: Sat Jul  8 17:19:15 2006
New Revision: 420229

URL: http://svn.apache.org/viewvc?rev=420229&view=rev
Log:
SITE-8
* Remove tab characters (oops!)
* Adjust spacing 
* Minor changes to Roadmap FAQ (sorry to mix formatting with editorial changes).


Modified:
    struts/site/src/site/fml/roadmap.fml
    struts/site/src/site/xdoc/index.xml

Modified: struts/site/src/site/fml/roadmap.fml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/fml/roadmap.fml?rev=420229&r1=420228&r2=420229&view=diff
==============================================================================
--- struts/site/src/site/fml/roadmap.fml (original)
+++ struts/site/src/site/fml/roadmap.fml Sat Jul  8 17:19:15 2006
@@ -26,15 +26,15 @@
                 <p>
                     <a href="http://wiki.apache.org/struts/StrutsTi";>Struts
                         Ti</a>
-                    (short for Titanium) was a codename for Struts 2.0.
+                    (short for Titanium) was a codename for Struts 2.
                     In late November 2005, the Ti proposal was amended to
                     include a merger with
                     <a href="http://www.opensymphony.com/webwork/";>Open
                         Symphony WebWork.</a>
-                    Pursuant to this plan, WebWork 2.3 was
+                    Pursuant to this plan, WebWork 2.2 was
                     donated to the ASF in March 2006,
                     and the active WebWork committers joined the Apache Struts 
Project.
-                    The WebWork 2.3 codebase was brought into the ASF through
+                    The WebWork codebase was brought into the ASF through
                     the
                     <a 
href="http://incubator.apache.org/projects/webwork2.html";>
                         Apache Incubator.</a>
@@ -46,7 +46,7 @@
                     <a 
href="http://incubator.apache.org/learn/rules-for-revolutionaries.html";>
                         Struts Revolution.</a>
                     Over the years, it has evolved into a superb action-based
-                    framework that retains many Struts 1.x paradigms.
+                    framework that retains many Struts 1 paradigms.
                 </p>
                 <p>
                     People who have worked with both Struts 1 and WebWork
@@ -59,11 +59,11 @@
                     If we had finished the original Struts 1 roadmap 
ourselves, 
                     Struts 1 would have ended up being a WebWork 2 workalike.
                     Rather than reinvent the wheel,
-                    Ti has become a proposal to put the WebWork wheel back on
+                    Ti became a proposal to put the WebWork wheel back on
                     the Struts axle.
                 </p>
                 <p>
-                    At this point, the Ti codename has being dropped,
+                    At this point, the Ti codename has been dropped,
                     and we are referring to the donated codebase as Struts 2.
                 </p>
             </answer>
@@ -73,57 +73,53 @@
             <question>If they share the same roots,
             why did WebWork evolve more quickly than Struts 1?</question>
             <answer>
-            <p>
-              The Struts 1.x release series is deeply into "backward 
-              compatibility" mode.
-              Backward compatibility has become an obsession with Struts 1.
-              Before making any API change, we deprecate the existing member,
-              and make at least one milestone release before removing the 
-              deprecated member.
-              Each Struts milestone is drop-and-go compatible with the last.
-              Maintaining this degree of stability takes a lot of effort,
-              but given the installed base, we feel it is worth the time and 
-              trouble.
-            </p>
-            <p>
-              There have been several proposals for a new Struts 2 codebase.
-              The first formal proposal was
-              <a 
href="http://wiki.apache.org/struts/StrutsJericho";>Jericho,</a>
-              followed by
-              <a href="http://wiki.apache.org/struts/StrutsShale";>Shale,</a>
-              and then
-              <a href="http://wiki.apache.org/struts/StrutsTi";>Ti.</a>
-            </p>
-            <p>
-              Jericho never progressed past the trial balloon stage.
-              Shale is based on JavaServer Faces, and, when the time came,
-              the Apache Struts PMC found that many of us were not ready to
-              adopt JSF just yet.
-              Initially, Shale was a Struts subproject,
-              but later Shale graduated to its own 
-              <a href="http://struts.apache.org/struts-shale";>top-level ASF 
-              project.</a>
-           </p>
-           <p>
-               The Ti proposal included the idea of collaborating with other
-               projects to build a "best of breed" framework that incorporated
-               everything we had learned over the past six years.
-               The original Ti proposal includes technology developed by
-               <a href="http://beehive.apache.org/";>Apache BeeHive,</a>
-               <a href="http://www.springframework.org/";>Spring,</a> and
-               <a href="http://www.opensymphony.com/webwork/";>OpenSympony 
WebWork.</a>
-           </p>
-           <p>
-                In the course of developing the initial Ti codebase,
-                the WebWork developers offered to "join forces" with
-                the Apache Struts developers,
-                so that we could work more closely together.
-           </p>
-           <p>
-                Out of these collaborations,
-                the <a 
href="http://struts.apache.org/announce.html#a20051214.3";>
-                Apache Struts/OpenSymphony WebWork</a> merger arose.
-           </p>
+                <p>
+                    The Struts 1.x release series is deeply into "backward 
+                    compatibility" mode.
+                    Backward compatibility has become an obsession with Struts 
1.
+                    Before making any API change, we deprecate the existing 
member,
+                    and make at least one milestone release before removing 
the 
+                    deprecated member.
+                    Each Struts milestone is drop-and-go compatible with the 
last.
+                    Maintaining this degree of stability takes a lot of effort,
+                    but given the installed base, we feel it is worth the time 
and 
+                    trouble.
+                </p>
+                <p>
+                  There have been several proposals for a new Struts 2 
codebase.
+                  The first formal proposal was
+                  <a 
href="http://wiki.apache.org/struts/StrutsJericho";>Jericho,</a>
+                  followed by
+                  <a 
href="http://wiki.apache.org/struts/StrutsShale";>Shale,</a>
+                  and then
+                  <a href="http://wiki.apache.org/struts/StrutsTi";>Ti.</a>
+                </p>
+                <p>
+                  Jericho never progressed past the trial balloon stage.
+                  Shale is based on JavaServer Faces, and, when the time came,
+                  the Apache Struts PMC found that many of us were not ready to
+                  adopt JSF just yet.
+                  Initially, Shale was a Struts subproject,
+                  but later Shale graduated to its own 
+                  <a href="http://struts.apache.org/struts-shale";>top-level 
ASF 
+                  project.</a>
+               </p>
+               <p>
+                   The Ti proposal includes the idea of collaborating with 
other
+                   projects to build a "best of breed" framework that 
incorporates
+                   everything we have learned over the past six years.
+                   The original Ti proposal included technology developed by
+                   <a href="http://beehive.apache.org/";>Apache BeeHive,</a>
+                   <a href="http://www.springframework.org/";>Spring,</a> and
+                   <a href="http://www.opensymphony.com/webwork/";>OpenSympony 
WebWork.</a>
+                   In the course of co-developing the initial Ti codebase,
+                   the WebWork team offered to "join forces" with
+                   the Apache Struts group,
+                   so that we could work more closely together.
+                   Out of these collaborations,
+                   the <a 
href="http://struts.apache.org/announce.html#a20051214.3";>
+                   Apache Struts/OpenSymphony WebWork</a> merger arose.
+               </p>
             </answer>
         </faq>
         
@@ -134,10 +130,13 @@
 
                 <p>
                     For the time being, there is no plan to migrate XWork to
-                    the ASF. Struts has always had many dependencies on
-                    external
-                    packages. So long as packages like XWork and SiteMesh are 
doing
-                    well at OpenSymphony, there is no reason to make further 
changes.
+                    to the ASF. 
+                    Struts has always had many dependencies on external 
+                    packages. 
+                    So long as projects like XWork and SiteMesh are doing  
+                    well at OpenSymphony, there is no reason to change venues.
+                    Of course, if another OpenSymphony project were ready to 
+                    join the ASF, our door is open.
                 </p>
             </answer>
         </faq>
@@ -177,12 +176,12 @@
                 <p>
                     While both Struts 1 and 2 support JSP, Velocity, and XSLT, 
                     Struts 2 has better support for JSF and first-class support
-                    for template languages like Velocity and 
-                    <a href="http://www.freemarker.org/";>FreeMarker.</a>
+                    for template engines like Velocity and 
+                    <a href="http://www.freemarker.org/";>FreeMarker,</a>
                     and, optionally, JasperReports.
                 </p>
                 <p>
-                    Both frameworks work well with AJAX, but Struts 2 includes 
an 
+                    Both versions work well with AJAX, but Struts 2 includes 
an 
                     AJAX theme that can give your interactive pages a boost.
                     Under the name WebWork, Struts 2 already powers many large 
                     enterprise-grade solutions, including 
@@ -193,14 +192,14 @@
                     On the JVM front, Struts 2 is targeted for Java 5, but  
                     provides backward compatibility for Java 4.
                     Struts 1 is targeted for Java 4. 
-                    (Struts 1 developers using Java 5 want to consider 
+                    (Struts 1 developers using Java 5 might want to consider 
                     <a href="http://strecks.sourceforge.net/";>Strecks,</a> 
-                   a set of Java 5 extensions for Struts 1.2.)
+                    a set of Java 5 extensions for Struts 1.2.)
                 </p>
                 <p>
                     If you would like to use JSF exclusively, 
-                   then <a href="http://shale.apache.org/";>
-                   Apache Shale</a> 
+                    then <a href="http://shale.apache.org/";>
+                        Apache Shale</a> 
                     is a good choice.
                     Originally a Struts subproject, 
                     Shale is now a top-level ASF project.
@@ -250,54 +249,55 @@
         </faq>
         
         <faq id="obsolete">
-          <question>Is Struts 1 obsolete?</question>
-          <answer>
-            <p>
-                 No.
-            </p>
-            <p>
-               There is a robust and vibrant community of developers using 
-               Struts 1 in production, and we expect that thousands of teams 
-               will continue to base new projects on Struts 1 and support 
-               existing projects, for many, many years to come. 
-            </p>
-            <p>
-               New and improved extensions to Struts 1 continue to appear 
-               regularly. 
-                In <strong>2006 alone</strong>, we've seen the release of 
-               
-               <a href="http://strecks.sourceforge.net/";>Strecks,</a>
-               <a href="http://www.jspcontrols.net";>JSP Control Tags,</a>
-               <a href="http://mojodna.net/sprout/";>Sprout,</a>
-               <a href="http://www.springframework.org/node/239";>Spring Web 
Flow,</a>
-               <a href="http://getahead.ltd.uk/dwr/";>DWR,</a>
-               <a href="http://calyxo.org/";>Calyxo,</a>
-               <a href="https://formdef.dev.java.net/";>FormDef,</a> and
-               <a href="http://javawebparts.sourceforge.net/";>Java Web 
Parts</a>.              
-
-               There are 
-               <a 
href="http://opensource.atlassian.com/confluence/oss/display/BOOKS/Books+about+Struts";>
-               dozens of books</a> and 
-               <a 
href="http://www.StrutsCentral.net/Resources/Action/articles-2006.html";>
-               hundreds of articles</a> available to help people get started 
with 
-               Struts 1 or improve the application they already have.
-            </p>
-            <p>
-               Since the merger, Struts 1 has gone on to release a new minor 
-               version, Struts 1.3, 
-               and new 1.x releases are being planned.
-               Struts 1 continues to be the most popular and best supported 
-               web application framework for Java.
-            </p>
-            
-            <p>
-               Of course, if you are starting a new project, and have your 
-               choice of frameworks, 
-               this would be a good time to consider whether you would like to 
-               continue to use Struts 1 or <a href="#choice">
-               whether it's time to try something else.</a> 
-            </p>            
-          </answer>          
+            <question>Is Struts 1 obsolete?</question>
+            <answer>
+                <p>
+                     No.
+                </p>
+                <p>
+                    There is a robust and vibrant community of developers 
using 
+                    Struts 1 in production, and we expect that thousands of 
teams 
+                    will continue to base new projects on Struts 1, and 
continue 
+                    to support existing projects, for many, many years to 
come. 
+                </p>
+                <p>
+                    New and improved extensions for Struts 1 continue to 
appear 
+                    regularly. 
+                    In <strong>2006 alone</strong>, we've seen releases of 
+
+                    <a 
href="http://www.sundog.net/index.php/hoople/page/struts/";>Hoople,</a>
+                    <a href="http://strecks.sourceforge.net/";>Strecks,</a>
+                    <a href="http://www.jspcontrols.net";>JSP Control Tags,</a>
+                    <a href="http://mojodna.net/sprout/";>Sprout,</a>
+                    <a href="http://www.springframework.org/node/239";>Spring 
Web Flow,</a>
+                    <a href="http://getahead.ltd.uk/dwr/";>DWR,</a>
+                    <a href="http://calyxo.org/";>Calyxo,</a>
+                    <a href="https://formdef.dev.java.net/";>FormDef,</a> and
+                    <a href="http://javawebparts.sourceforge.net/";>Java Web 
Parts</a>.              
+
+                    There are 
+                    <a 
href="http://opensource.atlassian.com/confluence/oss/display/BOOKS/Books+about+Struts";>
+                    dozens of books</a> and 
+                    <a 
href="http://www.StrutsCentral.net/Resources/Action/articles-2006.html";>
+                    hundreds of articles</a> available to help people get 
started with 
+                    Struts 1 or improve the application they already have.
+                </p>
+                <p>
+                    Since the merger, Struts 1 has gone on to release a new 
minor 
+                    version, Struts 1.3, 
+                    and new 1.x releases are being planned.
+                    Struts 1 continues to be the most popular and best 
supported 
+                    web application framework for Java.
+                </p>
+
+                <p>
+                   Of course, if you are starting a new project, and have your 
+                   choice of frameworks, 
+                   this might be a good time to consider whether you would 
like to 
+                   continue to use Struts 1 or <a href="#choice">
+                   whether it's time to try something else.</a> 
+                </p>            
+            </answer>          
          </faq>
 
         <faq id="migrate_s1">
@@ -309,8 +309,6 @@
                     applications in production.
                     Being able to migrate both applications and developer
                     skill sets is important to all of us.
-                </p>
-                <p>
                     The Struts 2 documentation includes a Migration Guide 
                     that outlines several migration strategies. 
                     Several classic Struts example applications, 
@@ -320,69 +318,69 @@
             </answer>
         </faq>
 
-            <faq id="subprojects">
-                <question>Why are there so many "components" for Struts 1 
now?</question>
-                <answer>
-                    <p>
-                        Over the years, the Struts 1 framework grew to include 
not only a
-                        controller and a set of taglibs but several other 
comonents,
-                        like Tiles, EL, Scripting, and Flow. There were also 
some
-                        optional classes that some people liked, but not 
everyone needed
-                        (like DispatchAction).
-                    </p>
-                    
-                    <p>
-                        For the Struts 1.3.0 build, we tried creating separate 
-                        distributions for the various packages that make up
-                        Struts. 
-                        Creating the separate distributions created problems 
of its own, 
-                        so for the Struts 1.3.1 build, and beyond, 
-                        we are consolidating the extensions back into a single 
-                        Struts 1.3 distribution. Each component has its own 
-               JAR but all share the same release cycle.
-                    </p>
-                 </answer>
-                               
-            </faq>
-
-            <faq id="classic">
-                <question>Is Struts Classic another name for Struts 1?
-                </question>
-                <answer>
-                    <p>Struts Classic is a codename for the work we needed to 
do to
-                        create and release the seven components we extracted 
from
-                        Struts 1.2. It is not a product per-se, but shorthand 
for the
-                        1.3.0 build of the seven components. 
-                     </p>
-                </answer>
-            </faq>
-
-            <faq id="overdrive">
-                <question>What about OverDrive or Struts Nexus?</question>
-                <answer>
-                    <p>
-                        <a 
href="http://wiki.apache.org/struts/StrutsOverDrive";>
-                            OverDrive</a>
-                        is a working proposal to use a set of case-study
-                        applications to drive the design and creation of a
-                        business layer framework.
-                        The codename for the business layer framework under
-                        development is "Nexus".
-                        Like Struts 1.3 and Apache Shale, the Nexus internals 
are based
-                        on the Chain of Responsibility pattern.
-                    </p>
-                    <p>
-                        OverDrive and Nexus do not complete with frameworks 
like
-                        Struts.
-                        Nexus begins where most presentation-layer frameworks 
end.
-                        Nexus is the "rest of the stack".
-                    </p>
-                    <p>
-                        The codebase underlying the proposal is being coded in 
C#,
-                        but a version for Java is expected in due course.
-                    </p>
-                </answer>
-            </faq>
+        <faq id="subprojects">
+            <question>Why are there so many "components" for Struts 1 
now?</question>
+            <answer>
+                <p>
+                    Over the years, the Struts 1 framework grew to include not 
only a
+                    controller and a set of taglibs but several other 
comonents,
+                    like Tiles, EL, Scripting, and Flow. There were also some
+                    optional classes that some people liked, but not everyone 
needed
+                    (like DispatchAction).
+                </p>
+
+                <p>
+                    For the Struts 1.3.0 build, we tried creating separate 
+                    distributions for the various packages that make up
+                    Struts. 
+                    Creating the separate distributions created problems of 
its own, 
+                    so for the Struts 1.3.1 build, and beyond, 
+                    we are consolidating the extensions back into a single 
+                    Struts 1.3 distribution. Each component has its own 
+                    JAR but all share the same release cycle.
+                </p>
+             </answer>
+        </faq>
+
+        <faq id="classic">
+            <question>Is Struts Classic another name for Struts 1?
+            </question>
+            <answer>
+                <p>
+                    Struts Classic is a codename for the work we needed to do 
to
+                    create and release the seven components we extracted from
+                    Struts 1.2. It is not a product per-se, but shorthand for 
the
+                    1.3.0 build of the seven components. 
+                 </p>
+            </answer>
+        </faq>
+
+        <faq id="overdrive">
+            <question>What about OverDrive or Struts Nexus?</question>
+            <answer>
+                <p>
+                    <a href="http://wiki.apache.org/struts/StrutsOverDrive";>
+                        OverDrive</a>
+                    is a working proposal to use a set of case-study
+                    applications to drive the design and creation of a
+                    business layer framework.
+                    The codename for the business layer framework under
+                    development is "Nexus".
+                    Like Struts 1.3 and Apache Shale, the Nexus internals are 
based
+                    on the Chain of Responsibility pattern.
+                </p>
+                <p>
+                    OverDrive and Nexus do not complete with frameworks like
+                    Struts.
+                    Nexus begins where most presentation-layer frameworks end.
+                    Nexus is the "rest of the stack".
+                </p>
+                <p>
+                    The codebase underlying the proposal is being coded in C#,
+                    but a version for Java is expected in due course.
+                </p>
+            </answer>
+        </faq>
 
     </part>
 

Modified: struts/site/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=420229&r1=420228&r2=420229&view=diff
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Sat Jul  8 17:19:15 2006
@@ -27,7 +27,7 @@
         <a name="Welcome"/>
         <section name="Apache Struts">
             <p>
-                                                               Apache Struts 
is a web development framework based on the 
+                Apache Struts is a web development framework based on the 
                 classic Model-View-Controller design.
             </p>
 
@@ -53,44 +53,44 @@
             </p>
             
             <p>
-                       The project is called "Struts" because the framework is 
meant to 
-                       provide the "invisible underpinnings" that support 
professional 
-                       application development. 
-                       Struts provides the glue that joins the various elements
-                       of the standard Java platform into a coherent whole. 
-                       Our goal is to leverage existing standards by providing 
the 
-                       missing pieces we need to create enterprise-grade 
applications 
-                       that are easy to maintain over time. 
+                The project is called "Struts" because the framework is meant 
to 
+                provide the "invisible underpinnings" that support 
professional 
+                application development. 
+                Struts provides the glue that joins the various elements
+                of the standard Java platform into a coherent whole. 
+                Our goal is to leverage existing standards by providing the 
+                missing pieces we need to create enterprise-grade applications 
+                that are easy to maintain over time. 
             </p>
-                               </section>
+                </section>
                 
         <a name="Project"/>
         <section name="The Apache Struts Project">
         
-                       <p>
-                                                               The Apache 
Struts Project is the open source community 
-                                                               that creates 
and maintains the the Apache Struts framework. 
-                                                               The project 
consists of a diverse group of volunteers who 
-                                                               share common 
values regarding collaborative, community-based 
-                                                               open source 
development. 
-                                                               The Apache 
Struts Project is proud to share these values with 
-                                                               our parent 
organization: The Apache Software Foundation.                                   
                             
-                                               </p>
-                                               
-                                               <p>
+            <p>
+                The Apache Struts Project is the open source community 
+                that creates and maintains the the Apache Struts framework. 
+                The project consists of a diverse group of volunteers who 
+                share common values regarding collaborative, community-based 
+                open source development. 
+                The Apache Struts Project is proud to share these values with 
+                our parent organization: The Apache Software Foundation.       
                         
+            </p>
+                        
+            <p>
 
-                                                               The Apache 
Sruts Project offers two major versions of the 
-                                                               Struts 
framework. <strong>Struts 1</strong> is recognized as 
-                                                               <em>the</em> 
most popular web application framework for Java. 
-                                                               The 1.x 
framework is mature, well-documented, and widely 
-                                                               supported. 
-                                                               Struts 1 is the 
best choice for teams who value proven 
-                                                               solutions.
-                                               </p>
-                                               
-                               <p>
-               <strong>Struts 2</strong> is a ground-up rewrite of the 
original 
-               action-centric framework.
+                The Apache Sruts Project offers two major versions of the 
+                Struts framework. <strong>Struts 1</strong> is recognized as 
+                <em>the</em> most popular web application framework for Java. 
+                The 1.x framework is mature, well-documented, and widely 
+                supported. 
+                Struts 1 is the best choice for teams who value proven 
+                solutions.
+            </p>
+                        
+            <p>
+                <strong>Struts 2</strong> is a ground-up rewrite of the 
original 
+                action-centric framework.
                 Struts 2 was originally known as 
                 <a href="http://www.opensymphony.com/webwork";>WebWork 2</a>. 
                 After working independently for several years, 
@@ -99,37 +99,37 @@
                 to create Struts 2.
                 The new framework is the best choice for teams who value 
                 elegant solutions to difficult problems. 
-                                               </p>
-                                               
-                                               <p>
-                                                               Struts 2 is 
still under construction. An initial release is 
-                                                               expected in the 
third quarter of 2006.
-                                               </p>
-                                               
+            </p>
+                        
+            <p>
+                Struts 2 is still under construction. An initial release is 
+                expected in the third quarter of 2006.
+            </p>
+                        
             <p>
                 For more about the future of Struts, see our
                 <a href="roadmap.html">Roadmap FAQ, </a> especially 
                 <a href="roadmap.html#choice">"What should I use with  
                 my next project?".</a>
              </p>
-                       </section>
-                       
-                       <section>
+            </section>
+            
+            <section>
             <a name="1.2.9"/>
             <subsection name="Struts 1.2.9 released">
 
-                <p>
-                    The best available version of Struts is
-                    <a href="announce.html#a20050322">
-                        <strong>Struts 1.2.9,</strong>
-                    </a>
-                    which was classified "General Availability"
-                    (or "Ready for Primetime") on 22 March 2006.
-                    The 1.2.9 release
-                    <a 
href="http://www.frsirt.com/english/advisories/2006/1205";>
-                        resolves three security issues,</a>
-                    and supercedes the Struts 1.2.8 release.
-                </p>
+            <p>
+                The best available version of Struts is
+                <a href="announce.html#a20050322">
+                    <strong>Struts 1.2.9,</strong>
+                </a>
+                which was classified "General Availability"
+                (or "Ready for Primetime") on 22 March 2006.
+                The 1.2.9 release
+                <a href="http://www.frsirt.com/english/advisories/2006/1205";>
+                    resolves three security issues,</a>
+                and supercedes the Struts 1.2.8 release.
+            </p>
 
             </subsection>
             


Reply via email to