You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2005/11/16 14:31:03 UTC

svn commit: r345010 - in /struts: build/trunk/ core/trunk/ core/trunk/xdocs/ site/trunk/ site/trunk/xdocs/

Author: husted
Date: Wed Nov 16 05:30:54 2005
New Revision: 345010

URL: http://svn.apache.org/viewcvs?rev=345010&view=rev
Log:
Begin final round of updates. I'll hold off updating the site until everything is consistent again. 

Modified:
    struts/build/trunk/project.xml
    struts/core/trunk/project.xml
    struts/core/trunk/xdocs/index.xml
    struts/core/trunk/xdocs/learning.xml
    struts/core/trunk/xdocs/milestones.xml
    struts/core/trunk/xdocs/roadmap.xml
    struts/site/trunk/project.xml
    struts/site/trunk/xdocs/index.xml
    struts/site/trunk/xdocs/navigation.xml

Modified: struts/build/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/build/trunk/project.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/build/trunk/project.xml (original)
+++ struts/build/trunk/project.xml Wed Nov 16 05:30:54 2005
@@ -77,27 +77,19 @@
   <gumpRepositoryId>struts-svn</gumpRepositoryId>
 
   <description>
-      The core of the Struts framework is a flexible control layer based on 
-      standard technologies like Java Servlets, JavaBeans, ResourceBundles, 
-      and Extensible Markup Language (XML), as well as various Jakarta Commons 
-      packages. 
-      
-      Struts encourages application architectures based on the Model 
-      2 approach, a variation of the classic Model-View-Controller (MVC) design 
-      paradigm. Struts provides its own Controller component and integrates with 
-      other technologies to provide the Model and the View. 
-      
-      For the Model, Struts can interact with any standard data access technology, 
-      including Enterprise Java Beans, JDBC, and Object Relational Bridge. 
-      
-      For the View, Struts works well with JavaServer Pages, including JSTL and 
-      JSF, as well as Velocity Templates, XSLT, and other presentation systems. 
-      
-      The Struts framework provides the invisible underpinnings every professional 
-      web application needs to survive. Struts helps you create an extensible 
-      development environment for your application, based on published standards 
-      and proven design patterns.
+        The goal of the Apache Struts project is to encourage application
+        architectures based on the "Model 2" approach, a variation of the
+        classic Model-View-Controller (MVC) design paradigm.
+        Under Model 2,
+        a servlet (or equivalent) manages business logic execution,
+        and presentation logic resides mainly in server pages.
       
+        The Apache Struts project encourages Model 2 designs in two ways.
+        First, by providing open source frameworks and toolkits
+        that help developers build applications for the web.
+        Second, by providing friendly and honest mailing lists
+        where both newcomers and veterans discuss how to use Struts software
+        in their own Model 2 applications.
   </description>
       
   <shortDescription>MVC Web Application Framework</shortDescription>

Modified: struts/core/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/project.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/core/trunk/project.xml (original)
+++ struts/core/trunk/project.xml Wed Nov 16 05:30:54 2005
@@ -29,6 +29,16 @@
     <!--        Project management section                                -->
     <!-- ################################################################ -->
 
+   <description>
+        Struts Action Framework is a flexible control layer based on
+        <a href="userGuide/preface.html">standard technologies</a> like Java
+        Servlets, JavaBeans, ResourceBundles, and XML, as well as various
+        <a href="http://jakarta.apache.org/commons/index.html">Jakarta
+        Commons</a> packages, like BeanUtils and Chain of Responsibility.
+        Struts Action Framework helps you create an extensible development environment for your
+        application, based on published standards and proven design patterns.
+   </description>
+
   <repository>
     <connection>scm|svn|http|//svn.apache.org/repos/asf/struts/core/trunk</connection>
     <developerConnection>scm|svn|https|//svn.apache.org/repos/asf/struts/core/trunk</developerConnection>

Modified: struts/core/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/index.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/core/trunk/xdocs/index.xml (original)
+++ struts/core/trunk/xdocs/index.xml Wed Nov 16 05:30:54 2005
@@ -24,29 +24,25 @@
 
 <body>
 
-<section name="Welcome to Struts Core Framework">
+<section name="Welcome to Struts Action Framework">
 <a name="Welcome"/>
 
     <p>
-        Struts Core Framework provides the invisible underpinnings every
-        professional web application needs to survive.
-    </p>
-    
-    <p>        
-        Struts Core is a flexible control layer based on
+        Struts Action Framework is a flexible control layer based on
         <a href="userGuide/preface.html">standard technologies</a> like Java
         Servlets, JavaBeans, ResourceBundles, and XML, as well as various
         <a href="http://jakarta.apache.org/commons/index.html">Jakarta
         Commons</a> packages, like BeanUtils and Chain of Responsibility.
-        Core helps you create an extensible development environment for your
-        application, based on published standards and proven design patterns.
+        Struts Action Framework helps you create an extensible development 
+        environment for your application, 
+        based on published standards and proven design patterns.
     </p>
 
-<subsection name="Struts Core in a Nutshell">
+<subsection name="Action Framework in a Nutshell">
 <a name="nutshell"/>
 
     <p>
-        Struts Core provides its own web <strong>Controller</strong> component and
+        Action Framework provides its own web <strong>Controller</strong> component and
         integrates with other technologies to provide the Model and the View.
         For the <strong>Model</strong>, Core can interact
         with standard data access technologies,
@@ -67,12 +63,12 @@
     </p>
     
     <p>
-    	The Struts Core Controller acts as a bridge between the application's 
+    	The Action Framework Controller acts as a bridge between the application's 
     	Model and the web View. When a request is received, the Controller invokes 
-    	the Struts <strong>Action</strong> class. The Action consults with the Model 
+    	an <strong>Action</strong> class. The Action class consults with the Model 
     	(or, preferably, a <strong>Facade</strong> representing your Model) 
     	to examine or update the application's state.
-    	Struts Core provides an <strong>ActionForm</strong> class to help transfer 
+    	The framework provides an <strong>ActionForm</strong> class to help transfer 
     	data between Model and View.     	
     </p>
     
@@ -98,7 +94,7 @@
         <a href="userGuide/preface.html#xml">XML</a> document
         and named "web.xml".
         Likewise,
-        Core uses a configuration file to initialize its own resources.
+        the framework uses a configuration file to initialize its own resources.
         These resources include
         <a href="userGuide/building_controller.html#action_form_classes">
         ActionForms</a> to collect input from users,
@@ -109,7 +105,7 @@
     </p>
 
     <p>
-        Here's a simple Struts configuration (struts-config.xml) for a login workflow:
+        Here's a simple configuration (struts-config.xml) for a login workflow:
     </p>
 
     <pre><code><![CDATA[
@@ -157,8 +153,8 @@
     ]]></code></pre>
 
     <p>
-        There are several other resources you can specify in an Struts
-        Core configuration file.
+        There are several other resources you can specify in the framework's 
+        configuration file.
         You can specify validations for the ActionForms in an XML descriptor,
         using the <a href="userGuide/dev_validator.html">Struts Validator</a>.
         A standard extension, <a href="userGuide/dev_tiles.html">Tiles</a>,
@@ -166,27 +162,26 @@
         </p>
 
     <p>
-        Struts Core is an extensible framework.
-        Every class deployed by Core can be replaced by your own default class.
+        Struts Action Framework is extensible.
+        Every class deployed by the framework can be replaced by your own default class.
         The properties of your default class can be set using the
         <a href="http://jakarta.apache.org/commons/digester/"> Digester's</a>
         <code>set-property</code> feature.
         This is one reason why there are so many
         <a href="http://wiki.apache.org/struts/StrutsResources/">contributor
-        extensions</a> for Struts Core.
-        Core provides a base framework, but you can still write <b>your</b>
+        extensions</a>.
+        We provide the base framework, but you can still write <b>your</b>
         application <b>your</b> way.
      </p>
 
     <p>
-        For more about Struts Core and its underlying technologies, see the
-        <a href="userGuide/index.html">User Guide</a>
-        and the Developer Guides.
+        For more about Struts Action Framework and its underlying technologies, see the
+        <a href="userGuide/index.html">User Guide</a>.
     </p>
 
 </subsection>
 
- <subsection name="Is Struts Core the best choice for every project?">
+ <subsection name="Is Struts Action Framework the best choice for every project?">
 
     <p>
         No. If you need to write a very simple application, with a handful of
@@ -211,7 +206,7 @@
 
 <section>
    <p class="right">
-   Next: <a href="learning.html">Learning about Struts Core</a>
+   Next: <a href="learning.html">Learning about Struts Action Framework</a>
    </p>
 </section>
 

Modified: struts/core/trunk/xdocs/learning.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/learning.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/core/trunk/xdocs/learning.xml (original)
+++ struts/core/trunk/xdocs/learning.xml Wed Nov 16 05:30:54 2005
@@ -25,10 +25,10 @@
 <body>
 
 <a name="Docs"/>
-<section name="Learning About Struts Core">
+<section name="Learning About Struts Action Framework">
 
     <p>
-        The <strong>official documentation</strong> for Struts Core is
+        The <strong>official documentation</strong> for Struts Action Framework is
         provided online and may be built locally from the source code
         distribution.
         To build the documentation, change to the subproject's
@@ -40,13 +40,13 @@
     </p>
 
     <p>
-        The Core documentation includes a <a href="userGuide/index.html">User Guide</a>,
-	<a href="./faqs/index.html">FAQ and Howto Guides</a>, 
+        Our documentation includes a <a href="userGuide/index.html">User Guide</a>,
+	<a href="./faqs/index.html">FAQs, and Howto Guides</a>, 
 	along with this top-level introduction.
     </p>
     
     <p>
-    	The <a href="apidocs/index.html">JavaDocs</a> 
+    	The <a href="apidocs/index.html">Javadocs</a> 
     	and <a href="http://svn.apache.org/viewcvs.cgi/struts/core/trunk/">source code</a> 
     	can also be browsed.
     </p>
@@ -63,7 +63,7 @@
         If you are previewing the documentation on the website,
         most of the links in this section will refer to the
         <strong>Nightly Build</strong>.
-        When learning about Struts Core,
+        When learning about the framework,
         <strong>be sure to refer to the documentation for the version
         you are actually using</strong>.
     </p>
@@ -73,44 +73,45 @@
  <subsection name="User Guide">
 
     <p>
-        The concise Struts Core <a href="userGuide/index.html"><strong>
+        Our concise <a href="userGuide/index.html"><strong>
         User Guide</strong></a>
         introduces the Model-View-Controller architecture,
-        and how it relates to the major components of Struts Core.
-        If you want to find out "How Core works", this is the place to start.
+        and how it relates to the major components of the framework.
+        If you want to find out "How Struts Action works", this is the place to start.
         Along with an architectural overview,
         the User Guide also includes detailed installation instructions
-        and release notes for each version of Struts Core.
+        and release notes for each version of the framework.
     </p>
 </subsection>
 
  <a name="FAQS"/>
- <subsection name="FAQS and HowTos">
+ <subsection name="FAQS and HOWTOs">
 
     <p>
-        The Struts Core <strong>FAQs</strong> are designed to fill in
-        any gaps left by the Javadocs or the User Guides.
+        Our <strong>FAQs</strong> and <strong>HOWTOs</strong> are designed to fill in
+        any gaps left by the Javadocs or User Guide.
     </p>
 
     <ul>
         <li>
-            The <a href="faqs/kickstart.html">Kickstart FAQ</a>
+            Our <a href="faqs/kickstart.html">Kickstart FAQ</a>
             answers the most common non-technical questions
-            people first ask about Struts Core.
+            people first ask about the framework.
         </li>
         <li>
-            The <a href="faqs/newbie.html">Struts Core Newbie FAQ</a>
-            answers the most common technical questions asked by first-timer
-            Struts Core developers.
+            Our <a href="faqs/newbie.html">Newbie FAQ</a>
+            answers the most common technical questions asked developers using 
+            the framework for the first-time.
+           
         </li>
     </ul>
 
     <p>
-        The <strong>Howto Guides</strong> are designed to help you get started
+        The <strong>HOWTO Guides</strong> are designed to help you get started
         with some of the optional extensions and components available
-        for Struts Core.
+        for the framework.
         These include topics like using the Secure Socket Layer (SSL) protocol
-        with Struts Core and how to unit test your Struts applications.
+        and how to unit test your applications.
     </p>
 
     <p>
@@ -122,23 +123,22 @@
     <p>
         Of course,
         the only true documentation is the code itself.
-        If you have any questions about how Struts Core actually works,
+        If you have any questions about how the framework actually works,
         do not hesitate to <em>use the source</em>.
-        For the complete, buildable source code to the entire
-        Struts Core product,
+        For the complete, buildable source code,
         see the "src" folder in your <strong>source distribution</strong>.
     </p>
 </subsection>
 
- <a name="JavaDocs"/>
- <subsection name="JavaDocs">
+ <a name="Javadocs"/>
+ <subsection name="Javadocs">
     <p>
         For more detail about a specific class or package,
-        the Struts Core <a href="apidocs/index.html"><strong>
+        our <a href="apidocs/index.html"><strong>
         Javadocs</strong></a> are <strong>surprisingly comprehensive and
         carefully maintained</strong>.
         It is <em>strongly</em> recommended that you refer to the
-        <a href="apidocs/index.html">JavaDocs</a> for each class
+        <a href="apidocs/index.html">Javadocs</a> for each class
         as you begin to use it.
         This will help ensure that important features and options are not
         overlooked.
@@ -147,10 +147,10 @@
 </subsection>
 
 <a name="Examples"/>
-<subsection name="Struts Core by Example">
+<subsection name="Struts Action Framework by Example">
     <p>
         To help you see how it all fits together, several example applications
-        are available that demonstrate using Struts Core with other
+        are available that demonstrate using the framework with other
         Apache Struts subprojects.
     </p>
 
@@ -158,10 +158,8 @@
         <li>
             Blank - A simple template for starting new Struts applications.
         </li>
-        <li>
-            <a href="http://opensource2.atlassian.com/confluence/oss/display/STRUTS/MailReader">
-            MailReader</a> - The original Struts example
-            application. <em>Try me first!</em>
+         <li>
+            Cookbook - See various techniques in action and view the source code in place. 
         </li>
         <li>
             Examples - Various demonstration applications combined as separate
@@ -180,6 +178,11 @@
                 </li>
             </ul>
         </li>
+        <li>
+            <a href="http://opensource2.atlassian.com/confluence/oss/display/STRUTS/MailReader">
+            MailReader</a> - The original Struts example
+            application. <em>Try me first!</em>
+        </li>
    </ul>
 
     <p>
@@ -215,7 +218,7 @@
 </subsection>
 
 <a name="More"/>
-<subsection name="Learning More About Struts Core">
+<subsection name="Learning More About Struts Action Framework">
     <p>
         The Struts <a href="http://struts.apache.org/mail.html">Mailing Lists</a>
         are a treasure trove of useful, interactive information.
@@ -259,7 +262,7 @@
 <a name="resources"/>
 <subsection name="Struts Community Resources">
     <p>
-        Struts Core has attracted a large and robust community of developers,
+        Apache Struts has attracted a large and robust community of developers,
         which have created a vast number of Struts related resources.
         Several pages on our wiki are devoted to listing
         <a href="http://wiki.apache.org/struts/StrutsResources">Apache Struts
@@ -290,7 +293,7 @@
 </subsection>
     
 <a name="books"/>
-<subsection name="Books about Struts">
+<subsection name="Books about Apache Struts">
 
        <p>
        The Apache Software Foundation does not provide printed manuals,

Modified: struts/core/trunk/xdocs/milestones.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/milestones.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/core/trunk/xdocs/milestones.xml (original)
+++ struts/core/trunk/xdocs/milestones.xml Wed Nov 16 05:30:54 2005
@@ -26,13 +26,13 @@
         <a name="milestones"/>
             <p>
                 These are some general ideas we have about what may happen in
-                the Struts Classic series.
+                the Struts Action Framework series.
                 This is a <strong>whiteboard</strong> and everything here is
                 <strong>subject to change</strong>.
             </p>
             
             <a name="struts_1_0"/>
-            <subsection name="Struts 1.0.0 (complete)">
+            <subsection name="Release 1.0.0 (complete)">
                 <p>
                     Major refactoring of Struts internals to provide support
                     for modules and a new
@@ -44,7 +44,7 @@
             </subsection>
 
             <a name="struts_1_2_4"/>
-            <subsection name="Struts 1.2.4 (complete)">
+            <subsection name="Release 1.2.4 (complete)">
                 <p>
                     Continued refactorings of the Struts 1.x product series.
                 </p>
@@ -64,14 +64,14 @@
             </subsection>
 
             <a name="struts_1_2_6"/>
-            <subsection name="Struts 1.2.6 (complete)">
+            <subsection name="Release 1.2.6 (complete)">
                 <p>
                     Migrated repository to Subversion; update website.
                 </p>
             </subsection>
 
             <a name="struts_1_2_x"/>
-            <subsection name="Struts 1.2.x (pending)">
+            <subsection name="Release 1.2.x (pending)">
                 <p>
                     Minor enhancements, improvements, and refactorings only,
                     as needed.
@@ -80,7 +80,7 @@
             </subsection>
 
             <a name="struts_1_3_x"/>
-            <subsection name="Struts Classic 1.3.x (pending)">
+            <subsection name="Release 1.3.x (pending)">
                 <p>
                     Evolutionary enhancements to product base,
                     based on existing features or codebases.
@@ -147,7 +147,7 @@
             </subsection>
 
             <a name="struts_1_4_x"/>
-            <subsection name="Struts Classic 1.4.x">
+            <subsection name="Release 1.4.x">
                 <ul>
                     <li>
                         Consider adding support for Portlets by specifying an
@@ -166,7 +166,7 @@
             </subsection>
 
             <a name="struts_1_5_x"/>
-            <subsection  name="Struts Classic 1.5.x">
+            <subsection  name="Release 1.5.x">
                <ul>
                     <li>
                         Consider a "smart" action type: executes Action class
@@ -183,7 +183,7 @@
             </subsection>
 
             <a name="struts_1_6_x"/>
-            <subsection name="Struts Classic 1.6.x">
+            <subsection name="Release 1.6.x">
                <ul>
                    <li>
                         Consider multiple controllers.
@@ -199,7 +199,7 @@
             </subsection>
 
             <a name="struts_1_x_x"/>
-            <subsection name="Other potential enhancements for the Classic series">
+            <subsection name="Other potential enhancements">
                 <ul>
                     <li>
                         Consider <a href="http://struts.sf.net/struts-cocoon/">

Modified: struts/core/trunk/xdocs/roadmap.xml
URL: http://svn.apache.org/viewcvs/struts/core/trunk/xdocs/roadmap.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/core/trunk/xdocs/roadmap.xml (original)
+++ struts/core/trunk/xdocs/roadmap.xml Wed Nov 16 05:30:54 2005
@@ -32,7 +32,7 @@
 
     <p>
     This document outlines some of changes we expect to
-    see in future releases of Struts.
+    see in future releases of Struts Action Framework and related subprojects.
     </p>
 
     <p>
@@ -53,7 +53,7 @@
     <subsection name="Bugzilla Queries">
 
         <p>
-            The Struts development team uses the
+            The Struts development community uses the
             <a href="http://issues.apache.org/bugzilla">
             Apache Bug Database</a> (Bugzilla) to manage problem reports
             and enhancement suggestions.
@@ -81,18 +81,21 @@
     </subsection>
 
 <a name="Struts_1_x"/>
-<subsection name="Struts Classic 1.x">
+<subsection name="Struts Action Framework 1.x">
 
     <p>
-        Through Struts 1.2.x, the project's codebase was bundled as a single
+        Through version 1.2.x, the project's codebase was bundled as a single
         distribution with a single release cycle.
-        Post Struts 1.2.x, the project's codebase is separated into several
+        Post version 1.2.x, the project's codebase is separated into several
         subprojects, each with it's own distribution and release cycle.
+        The core controller classes are now available as Struts Action 
+        Framework. The taglibs classes are now available and Struts Taglib, 
+        and so forth.
     </p>
 
     <p>
         Popular third-party extensions that are in active use by the Struts
-        Classic Community may be considered as new subprojects,
+        community may be considered as new subprojects,
         such as those distributed through the
         <a href="http://sourceforge.net/projects/struts">
         Struts SourceForge</a> site.
@@ -103,23 +106,15 @@
     </p>
 
     <p>
-        As a convenience, the subprojects representing the Struts 1.2.x
-        code base are being bundled into a single distribution called
-        "Struts Classic".
-        Remarks previously made about the "Struts 1.x series" now apply to
-        the "Struts Classic" series.
-    </p>
-
-    <p>
-        Releases in the Struts Classic series will focus on refactoring of
+        Releases in the 1.x series will focus on refactoring of
         existing functionality, with a continued emphasis on backward
         compatibility.
     </p>
     <p>
-        New features are being added to the Struts Classic series,
+        New features are being added to the 1.x series,
         but only if backward compatability with the prior release can be
         retained.
-        The Struts Classic API is evolving through a strict
+        The framework's API is evolving through a strict
         deprecate/replace/remove protocol.
         Developers are encouraged to stay current with the "best available"
         release and to observe deprecation warnings.
@@ -128,7 +123,7 @@
     </p>
 
     <p>
-        Throughout the Struts Classic series,
+        Throughout the 1.x series,
         there will be a continued emphasis on expanding unit test coverage.
         Bug reports should include a failing test case when possible.
         Proposals for new features should include a working test suite.
@@ -173,16 +168,16 @@
     </subsection>
 
     <a name="Struts_1_3_x"/>
-    <subsection name="Struts Core 1.3.x and beyond">
+    <subsection name="Struts Action Framework 1.3.x and beyond">
 
         <p>
-            An outline of the Struts Core enhancements proposed here
+            An outline of the enhancements proposed here
             can be found on the
             <a href="milestones.html">Milestones</a> page.
         </p>
 
         <p>
-            Struts Core 1.3.x utilizes Struts Chain as the default request
+            The 1.3.x series utilizes Struts Chain as the default request
             processor and adds an "extends" attribute to all the
             configuration elements (a la Tiles).
             We would also like to add a Ant-style properties file to make
@@ -278,7 +273,7 @@
     </subsection>
 
     <a name="Struts_1_4_x"/>
-    <subsection name="Struts Core 1.4.x considerations">
+    <subsection name="Struts Action Framework 1.4.x considerations">
 
         <p>
             One we get past 1.3.x,
@@ -322,7 +317,7 @@
     </subsection>
 
     <a name="Struts_1_5_x"/>
-    <subsection name="Struts Core 1.5.x considerations">
+    <subsection name="Struts Action Framework 1.5.x considerations">
 
         <p>
             Based on our own work with the "experimental" members
@@ -365,7 +360,7 @@
     </subsection>
 
     <a name="Struts_1_6_x"/>
-    <subsection name="Struts Core 1.6.x considerations">
+    <subsection name="Struts Action Framework 1.6.x considerations">
 
         <p>
             <b>Consider multiple controllers.</b>
@@ -406,7 +401,7 @@
     <ul>
 
         <li>
-            Struts APIs assume servlet API objects (ServletContext,
+            The framrwork APIs assume servlet API objects (ServletContext,
             ServletRequest, ServletResponse), whereas JSR-168 talks about
             PortletContext, PortletRequest, and PortletResponse.
             We'd either need to change the calling sequence for

Modified: struts/site/trunk/project.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/project.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/site/trunk/project.xml (original)
+++ struts/site/trunk/project.xml Wed Nov 16 05:30:54 2005
@@ -27,6 +27,11 @@
     <!--        Project management section                                -->
     <!-- ################################################################ -->
 
+  <description>
+    Struts Site is the Apache Struts home page, 
+    the top-level portal to all other Struts frameworks and subprojects. 
+  </description>
+
   <repository>
     <connection>scm|svn|http://svn.apache.org/repos/asf/struts/site/trunk</connection>
     <developerConnection>scm|svn|https://svn.apache.org/repos/asf/struts/site/trunk</developerConnection>

Modified: struts/site/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/index.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/site/trunk/xdocs/index.xml (original)
+++ struts/site/trunk/xdocs/index.xml Wed Nov 16 05:30:54 2005
@@ -129,8 +129,9 @@
         as one monolithic bundle.
 	Today, the Apache Struts project is comprised of two distinct frameworks 
 	and several other subprojects. 
-	The two frameworks are <strong>Struts Core</strong> and <strong>Struts Shale</strong>. 
-	Struts Core is the original request-based framework. 
+	The two frameworks are the <strong>Struts Action Framework</strong> and 
+	the <strong>Struts Shale Framework</strong>. 
+	Struts Action is the original request-based framework. 
 	Struts Shale is a component-based framework based on JavaServer Faces. 
 	Both frameworks are first-class citizens of the Apache Struts project.
     </p>
@@ -146,23 +147,23 @@
     </p>
 
     <p>
-	If you are starting a new project, you might want to consider Struts Shale.
+	If you are starting a new project, you might want to consider our Shale Framework.
 	Some people feel that JSF and Shale is the quickest way to write new Java web applications.
     </p>
 
     <p>	
-	If you have mature Struts Core applications in production, don't worry, 
+	If you have mature Action Framework applications in production, don't worry, 
 	we are still here, same as ever. 
 	After all, we have our share of mature application in production too.
     </p>
 
     <p>	
-	To make the Struts Core framework easier to maintain, 
+	To make the Struts Action Framework easier to maintain, 
 	we've subdivided the original monolithic distribution into several subprojects. 
 	Each subproject has its own website, documentation, and release cycle, 
 	and may be downloaded separately. 
-	The JARs and external dependencies for our extensions to Struts Core are being 
-	bundled into a convenient distribution known as the "Struts Core Library".
+	The JARs and external dependencies for our extensions to Struts Action are being 
+	bundled into a convenient distribution known as the "Struts Action Library".
     </p>
     </subsection>
 

Modified: struts/site/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewcvs/struts/site/trunk/xdocs/navigation.xml?rev=345010&r1=345009&r2=345010&view=diff
==============================================================================
--- struts/site/trunk/xdocs/navigation.xml (original)
+++ struts/site/trunk/xdocs/navigation.xml Wed Nov 16 05:30:54 2005
@@ -56,7 +56,7 @@
     </menu>
 
     <menu name="Frameworks">
-        <item name="Core Framework" href="/struts-core/index.html"/>
+        <item name="Action Framework" href="/struts-core/index.html"/>
         <item name="Shale Framework" href="shale/index.html" />
     </menu>
  



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org