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/07/07 13:32:48 UTC

svn commit: r419872 - in /struts/struts1/trunk: ./ src/site/xdoc/ src/site/xdoc/faqs/ src/site/xdoc/userGuide/

Author: husted
Date: Fri Jul  7 04:32:46 2006
New Revision: 419872

URL: http://svn.apache.org/viewvc?rev=419872&view=rev
Log:
STR-2898 : Tweaks, update links and product names, from welcome through userGuide

Modified:
    struts/struts1/trunk/pom.xml
    struts/struts1/trunk/src/site/xdoc/faqs/apps.xml
    struts/struts1/trunk/src/site/xdoc/index.xml
    struts/struts1/trunk/src/site/xdoc/learning.xml
    struts/struts1/trunk/src/site/xdoc/roadmap.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
    struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml

Modified: struts/struts1/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/pom.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/pom.xml (original)
+++ struts/struts1/trunk/pom.xml Fri Jul  7 04:32:46 2006
@@ -123,7 +123,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>2.0-beta-4</version>
+                    <version>2.0-beta-5</version>
                 </plugin>
             </plugins>
         </pluginManagement>

Modified: struts/struts1/trunk/src/site/xdoc/faqs/apps.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/faqs/apps.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/faqs/apps.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/faqs/apps.xml Fri Jul  7 04:32:46 2006
@@ -53,7 +53,7 @@
                     <li>This document focuses on form/data centric
                         applications, but may also work with
                         other types of applications.</li>
-                    <li>This material was originally written for version 1.1 (beta 2), 
+                    <li>This material was originally written for Struts 1.1 (beta 2), 
                         and reviewed for the 1.2.2 and 1.3.0 releases.</li>
                 </ol>
             </subsection>
@@ -225,12 +225,12 @@
                             </li>
                             <li>Unit Testing
                                 <ol>
-                                    <li>Unit test normal java beans with
+                                    <li>Unit test normal JavaBeans with
                                         JUnit.
                                         <a href="http://www.junit.org">
                                             (more...)</a>
                                     </li>
-                                    <li>Unit test JSP, taglibs and
+                                    <li>Unit test JSP, taglibs, and
                                         conventional servlet components
                                         with Cactus.
                                         <a href="http://jakarta.apache.org/cactus">
@@ -254,7 +254,7 @@
                             </li>
                             <li>Deployment
                                 <ol>
-                                    <li>Build script should create a war file
+                                    <li>Build script should create a WAR file
                                         containing the
                                         files developed above, along with
                                         files that make up the 

Modified: struts/struts1/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/index.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/index.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/index.xml Fri Jul  7 04:32:46 2006
@@ -24,7 +24,7 @@
 
     <body>
 
-        <section name="Welcome to Struts 1.x">
+        <section name="Welcome to Struts 1">
             <a name="Welcome"/>
 
             <p>
@@ -72,7 +72,8 @@
                     <a href="http://java.sun.com/products/jsp/">JavaServer
                         Pages,</a>
                     including
-                    <a href="faqs/kickstart.html#jsf">JSTL and JSF,</a>
+                    <a href="struts-el/index.html">JSTL</a> and 
+                    <a href="struts-faces/index.html">JSF,</a>
                     as well as
                     <a href="http://jakarta.apache.org/velocity/tools/struts/">
                         Velocity Templates,</a>
@@ -214,7 +215,7 @@
                     <code>set-property</code>
                     feature.
                     This is one reason why there are so many
-                    <a href="http://wiki.apache.org/struts/StrutsResources/">
+                    <a href="learning.html#resources">
                         contributor
                         extensions.</a>
                     We provide the base framework, but you can still write

Modified: struts/struts1/trunk/src/site/xdoc/learning.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/learning.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/learning.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/learning.xml Fri Jul  7 04:32:46 2006
@@ -32,13 +32,20 @@
                 <strong>official documentation</strong>
                 for the framework is
                 provided online and may be built locally from the source code
-                distribution.
+                distribution using <a href="http://maven.apache.org/">Apache Maven 2</a>.
                 To build the documentation, change to the subproject's
                 folder and run
             </p>
 
             <p>
-                $ maven site
+                $ mvn site
+            </p>
+            
+            <p>
+            For more help with building the website, visit the 
+            <a href="http://wiki.apache.org/struts/StrutsMaintenanceWebsite">
+            Struts Maintenance - Website</a> 
+            page. 
             </p>
 
             <p>
@@ -52,7 +59,7 @@
                 The
                 <a href="apidocs/index.html">Javadocs</a>
                 and
-                <a href="http://svn.apache.org/viewcvs.cgi/struts/action/trunk/">
+                <a href="http://svn.apache.org/viewcvs.cgi/struts/struts1/trunk/">
                     source code</a>
                 can also be browsed.
             </p>
@@ -98,7 +105,7 @@
                 </p>
             </subsection>
 
-            <a name="FAQS"/>
+            <a name="faqs"/>
             <subsection name="FAQS and HOWTOs">
 
                 <p>
@@ -251,13 +258,13 @@
                             JPetStore</a>
                         -
                         A streamlined version of the Java Petstore application
-                        implemented with SAF and iBATIS database
+                        implemented with Struts and iBATIS database
                         layer.
                     </li>
                     <li>
                         <a href="http://www.codeczar.com/products/logweb/index.html">
                             LogWeb</a>
-                        - A SAF webapp for configuring
+                        - A Struts webapp for configuring
                         Log4J at runtime within a servlet container.
                     </li>
                 </ul>
@@ -351,7 +358,7 @@
             <a name="resources"/>
             <subsection name="Community Resources">
                 <p>
-                    Apache Struts has attracted a large and robust community
+                    The framework has attracted a large and robust community
                     of developers,
                     which have created a vast number of Struts related
                     resources.
@@ -365,7 +372,7 @@
                     For a comprehensive listing of all resources related to 
                     Apache Struts, 
                     including articles, books, and third-party extensions, 
-                    for Struts 1 and Struts 2, 
+                    for both Struts 1 and Struts 2, 
                     visit <a href="http://www.StrutsCentral.net/">Struts Central.</a>
                 </p>
 

Modified: struts/struts1/trunk/src/site/xdoc/roadmap.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/roadmap.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/roadmap.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/roadmap.xml Fri Jul  7 04:32:46 2006
@@ -29,8 +29,7 @@
 
                 <p>
                     This document outlines some of changes we expect to
-                    see in future releases of Struts and
-                    related subprojects.
+                    see in future releases of Struts 1.
                 </p>
 
                 <p>
@@ -46,10 +45,10 @@
             <subsection name="JIRA Queries">
 
                 <p>
-                    The Apache Struts development community uses the
+                    The Apache Struts Projects uses the
                     <a href="http://issues.apache.org/struts/">
-                        Apache Bug Database</a>
-                    (JIRA) to manage problem reports
+                        JIRA issuer tracker</a>
+                    to manage problem reports
                     and enhancement suggestions.
                     For your convenience, here are some common JIRA 
                     queries:

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_controller.xml Fri Jul  7 04:32:46 2006
@@ -29,7 +29,10 @@
             <subsection name="4.1 Overview">
 
                 <p>
-                    Now that we understand how to construct the Model and View
+                    Now that we understand how to construct the 
+                    <a href="building_model.html">Model</a> 
+                    and 
+                    <a href="building_view.html">View</a>
                     components
                     of your application, it is time to focus on the Controller
                     components.
@@ -52,7 +55,9 @@
                     <li>
                         Write an Action class for each logical request that
                         may
-                        be received (extend org.apache.struts.action.Action).
+                        be received (extend the 
+                        <code>[org.apache.struts.action.Action]</code>
+                        class).
                     </li>
 
                     <li>
@@ -128,7 +133,7 @@
 
                 <p>
                     Our controller delegates most of this grunt work to the
-                    <a href="#4_2_1_Request_Processor">Request Processor</a>
+                    <a href="#request_processor">Request Processor</a>
                     and Action classes.
                 </p>
 
@@ -2050,8 +2055,7 @@
                         configuration DTD</a>
                     and the
                     <a href="../apidocs/org/apache/struts/action/ActionMapping.html">
-                        ActionMapping documentation</a>
-                    .
+                        ActionMapping documentation.</a>
                 </p>
 
             </subsection>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_model.xml Fri Jul  7 04:32:46 2006
@@ -32,8 +32,7 @@
                     Many requirements documents used for building web
                     applications focus on
                     the
-                    <em>View</em>
-                    .
+                    <em>View.</em>
                     However, you should ensure that the processing required
                     for each submitted
                     request is also clearly defined from the

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/building_view.xml Fri Jul  7 04:32:46 2006
@@ -33,26 +33,20 @@
                     components,
                     but does not provide any actual view components of its
                     own.
-                    Several options are available, such as
-                    <a href="http://struts.apache.org/struts-taglib/">Struts
-                        Taglib,</a>
-                    <a href="http://struts.sourceforge.net/struts-cocoon/">
-                        Struts Cocoon,</a>
-                    <a href="http://jakarta.apache.org/velocity/tools/struts/">
-                        Struts Velocity,</a>
-                    and
-                    <a href="http://stxx.sourceforge.net/">Stxx,</a>
-                    among others.
+                    Several <a href="#presentation_frameworks">
+                    	presentation technologies</a> are available, 
+                    including, among others, Cocoon, JSP, Velocity Templates, 
+                    and XSLT.
                 </p>
 
                 <p>
                     Features provided by the framework for direct use by view
                     components
                     include
-                    <a href="#resources">Message Resources</a>
+                    <a href="#i18n">Message Resources</a>
                     for localizing text and images,
                     and
-                    <a href="#formbeans">FormBeans</a>
+                    <a href="#form_beans">FormBeans</a>
                     to provide for automatic
                     population and validation.
                 </p>
@@ -316,7 +310,7 @@
                     the ActionForm beans and the other controller components
                     are
                     View neutral.
-                    The framework be used with Cocoon, Velocity Templates,
+                    The framework can also be used with Cocoon, Velocity Templates,
                     XSLT, and
                     any other presentation technology that can be rendered via
                     a Java servlet.
@@ -689,13 +683,13 @@
                     technologies,
                     and there are a great number of extensions that
                     make creating view components even easier.
+                    Some popular presentation technologies include:
                 </p>
-
-                Some popular presentation layer technologies include:
+                
                 <ul>
                     <li>
                         <a href="http://struts.apache.org/struts-taglib/">
-                            Struts Taglibs</a>
+                            Struts Taglib</a>
                     </li>
                     <li>
                         <a href="http://struts.sourceforge.net/struts-cocoon/">

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/configuration.xml Fri Jul  7 04:32:46 2006
@@ -634,17 +634,26 @@
                 <p>
                     There are three approaches for switching from one module
                     to another.
+                </p>
+                
+                <ol>
+                	<li>
                     You can use the
                     <code>org.apache.struts.actions.SwitchAction</code>
                     from the Extras JAR,
+                  </li>
+                  <li>
                     you can use a
                     <code>&lt;forward&gt;</code>
                     (global or local) and specify the contextRelative
                     attribute with a value of true,
+                  </li>
+                  <li>
                     or you can specify the "module" parameter as part of any
                     of the Struts JSP hyperlink tags (Include, Img, Link,
                     Rewrite, or Forward).
-                </p>
+                  </li>
+                </ol>
 
                 <p>
                     You can use

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/installation.xml Fri Jul  7 04:32:46 2006
@@ -69,42 +69,12 @@
                     </li>
 
                     <li>
-                        <strong>XML Parser</strong>
-                        - The framework
-                        <strong>requires</strong>
-                        the presence of an XML
-                        parser that is compatible with the Java API for XML
-                        Parsing (JAXP)
-                        specification, 1.1 or later. This is bundled with J2SE
-                        1.4 and later.
-                        For earlier versions of Java, the easiest way to
-                        obtain JAXP is
-                        probably by downloading the Web Services Developers
-                        Kit
-                        (1.1 or later!). See the
-                        <a href="http://java.sun.com/xml/jaxp/faq.html#jaxp-ri-latest">
-                            Sun JAXP FAQ</a>
-                        for more information.)
-                        In your applications, you may replace the reference
-                        implementation classes with any other JAXP compliant
-                        parser, such as
-                        <a href="http://xml.apache.org/xerces-j">Xerces</a>
-                        . See detailed
-                        instructions related to the parser in the instructions
-                        for
-                        <a href="#Building">building</a>
-                        and
-                        <a href="#Installing">installing</a>
-                        the framework, below.
-                    </li>
-
-                    <li>
                         <strong>Maven Build System</strong>
-                        - If you are building the framework from the
+                        - (optional) If you are building the framework from the
                         source distribution, you must download and install the
-                        <a href="http://maven.apache.org/maven-1.x/">Apache
-                            Maven 1.0.2</a>
-                        build system.
+                        <a href="http://maven.apache.org/">Apache
+                            Maven 2</a>
+                        build system (2.0-beta-5, or later).
                     </li>
 
                 </ul>
@@ -115,7 +85,7 @@
                         href="Installing">
 
                 <p>First, download a binary distribution of Struts
-                    Framework Library by following the
+                    by following the
                     instructions
                     <a href="http://struts.apache.org/downloads.html">here,</a>
                     Then, make sure
@@ -127,9 +97,8 @@
 
                 <p>Unpack the Library distribution into a convenient
                     directory.
-                    (If you
-                    <a href="#Building">building from the source
-                        distribution,</a>
+                    (If you are <a href="http://struts.apache.org/downloads.html#Building">
+                    building from the source distribution,</a>
                     the result of the build will already be an unpacked binary
                     distribution
                     for you). The distribution consists of the following
@@ -329,33 +298,6 @@
                             Example Application.</a>
                     </li>
                 </ul>
-            </subsection>
-
-            <subsection name="Building From Source" href="Building">
-
-                <p>
-                    First, download a source distribution by following the
-                    instructions
-                    <a href="http://struts.apache.org/downloads.html">here.</a>
-                    Then, make sure
-                    you have downloaded and installed
-                    <a href="http://maven.apache.org/maven-1.x/">Apache Maven
-                        1.0.2</a>
-                </p>
-
-                <p>
-                    Change to the component you would like to build, and
-                    invoke
-                </p>
-
-                <source>mvn build</source>
-
-                <p>
-                    Go to the \build directory and run the command
-                </p>
-
-                <source>$mvn build-all</source>
-
             </subsection>
 
             <subsection>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/introduction.xml Fri Jul  7 04:32:46 2006
@@ -101,7 +101,7 @@
                     McClanahan to provide a standard MVC
                     framework to the Java community. In July 2001, version 1.0
                     was released, and IOHO, Java
-                    Model 2 development will never be quite the same.
+                    Model 2 development has never been quite the same.
                 </p>
 
             </subsection>
@@ -267,7 +267,7 @@
                 <p>
                     The
                     <em>View</em>
-                    portion of a SAF-based application is most often
+                    portion of a Struts-based application is most often
                     constructed using JavaServer Pages (JSP) technology. JSP
                     pages can
                     contain static HTML (or XML) text called "template text",
@@ -397,7 +397,7 @@
                 </p>
 
                 <p>
-                    The Struts Taglibs (another component) provide direct
+                    The Struts Taglib component provides direct
                     support for the
                     <strong>View</strong>
                     layer
@@ -683,12 +683,11 @@
                     <a href="index.html">Other sections</a>
                     in this document cover the
                     various framework components in greater detail.
-                    The Struts Taglib distribution includes several Developer
+                    The Struts Taglib component includes several Developer
                     Guides
-                    covering various aspects of the tag components.
-                    The Struts Applications component provides sample
-                    applications
-                    that show how it all comes together.
+                    covering various aspects of the custom tags.
+                    A number of sample applications are bundled with the 
+                    distribution that show how it all comes together.
                 </p>
 
                 <p>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml Fri Jul  7 04:32:46 2006
@@ -85,9 +85,9 @@
                     but not these technologies,
                     the best overall starting point is
                     <a href="http://java.sun.com/j2ee/tutorial/1_3-fcs/index.html">
-                        <strong>The J2EE Tutorial.</strong>
+                        The J2EE Tutorial.
                     </a>
-                    This document is also available for download in
+                    The tutorial is also available for download in
                     <a href="http://java.sun.com/webservices/docs/1.0/tutorial/doc/JavaWSTutorial.pdf">
                         PDF</a>
                     format.
@@ -106,7 +106,7 @@
                     generally,
                     then the best starting point is
                     <a href="http://java.sun.com/docs/books/tutorial/index.html">
-                        <strong>The Java Tutorial.</strong>
+                        The Java Tutorial.
                     </a>
                     This overlaps with The J2EE Tutorial in some
                     places, but the two work well together.
@@ -138,7 +138,7 @@
                     the Web and web applications.
                 </p>
 
-                <p>While building web applications, some Java developers will
+                <p>While building web applications, some Java developers 
                     write their own HTML. Others leave that responsibility to
                     the
                     page designers.</p>
@@ -148,34 +148,34 @@
                 <ul>
                     <li>
                         <a href="http://www.w3.org/MarkUp/Guide/">
-                            <strong>Getting started with HTML</strong>
+                            Getting started with HTML
                         </a>
                         by Dave Raggett
                     </li>
                     <li>
                         <a href="http://java.sun.com/j2ee/tutorial/1_3-fcs/doc/HTTP.html">
-                            <strong>HTTP Overview</strong>
+                            HTTP Overview
                         </a>
                         in The J2EE Tutorial.
                     </li>
                     <li>
                         <a href="http://www.rfc-editor.org/rfc/rfc2616.txt">
-                            <strong>HTTP/1.1
-                            </strong>
+                            HTTP/1.1
+                            
                         </a>
                         Specification
                     </li>
                     <li>
                         <a href="http://www.rfc-editor.org/rfc/rfc2617.txt">
-                            <strong>HTTP
-                                Basic and Digest Authentication</strong>
+                            HTTP
+                                Basic and Digest Authentication
                         </a>
                         Specification
                     </li>
                     <li>
                         <a href="http://www.rfc-editor.org/rfc/rfc2109.txt">
-                            <strong>State
-                                Management Mechanism</strong>
+                            State
+                                Management Mechanism
                         </a>
                         Specification (Cookies)
                     </li>
@@ -232,14 +232,13 @@
                 <ul>
                     <li>
                         <a href="http://java.sun.com/docs/books/tutorial/java/index.html">
-                            <strong>Learning the Java Language</strong>
+                            Learning the Java Language
                         </a>
                         in the Java Tutorial
                     </li>
                     <li>
                         <a href="http://java.sun.com/docs/books/tutorial/essential/threads/index.html">
-                            <strong>Threads: Doing Two or More Tasks At
-                                Once</strong>
+                            Threads: Doing Two or More Tasks At Once
                         </a>
                         in the Java Language
                         Tutorial
@@ -255,14 +254,14 @@
                 <ul>
                     <li>
                         <a href="http://www.laputan.org/drc/drc.html">
-                            <strong>Designing Reusable Classes</strong>
+                            Designing Reusable Classes
                         </a>
                         by Ralph E. Johnson &amp; Brian Foote
                     </li>
                     <li>
                         <a href="http://www.cs.wustl.edu/~schmidt/CACM-frameworks.html">
-                            <strong>Object-Oriented Application
-                                Frameworks</strong>
+                            Object-Oriented Application
+                                Frameworks
                         </a>
                         by Mohamed Fayad and Douglas C. Schmidt
                     </li>
@@ -366,9 +365,9 @@
                 <ul>
                     <li>
                         <a href="http://java.sun.com/products/javabeans/docs/">
-                            <strong>The
+                            The
                                 JavaBeans Component Architecture
-                                Documentation</strong>
+                                Documentation
                         </a>
                         page at
                         <code>java.sun.com,</code>
@@ -378,13 +377,13 @@
                     </li>
                     <li>
                         <a href="http://java.sun.com/docs/books/tutorial/javabeans/index.html">
-                            <strong>The JavaBeans Trail</strong>
+                            The JavaBeans Trail
                         </a>
                         in the Java Tutorial
                     </li>
                     <li>
                         <a href="http://java.sun.com/j2ee/tutorial/1_3-fcs/doc/JSPBeans.html">
-                            <strong>JavaBeans Components in JSP Pages</strong>
+                            JavaBeans Components in JSP Pages
                         </a>
                         in The J2EE Tutorial
                     </li>
@@ -511,8 +510,8 @@
                 <ul>
                     <li>
                         <a href="http://java.sun.com/docs/books/tutorial/essential/attributes/properties.html">
-                            <strong>Using Properties to Manage Program
-                                Attributes</strong>
+                            Using Properties to Manage Program
+                                Attributes
                         </a>
                         in The Java Tutorial
                     </li>
@@ -532,7 +531,7 @@
                 <ul>
                     <li>
                         <a href="http://java.sun.com/docs/books/tutorial/i18n/resbundle/concept.html">
-                            <strong>About the ResourceBundle Class</strong>
+                            About the ResourceBundle Class
                         </a>
                         in the Java Tutorial
                     </li>
@@ -645,23 +644,23 @@
                 <ul>
                     <li>
                         <a href="http://java.sun.com/products/servlet/">
-                            <strong>The
-                                Java Servlet Technology</strong>
+                            The
+                                Java Servlet Technology
                         </a>
                         page at
                         <code>java.sun.com</code>
                     </li>
                     <li>
                         <a href="http://java.sun.com/products/servlet/download.html">
-                            <strong>The
-                                Servlet 2.3 and 2.4 Specifications</strong>
+                            The
+                                Servlet 2.3 and 2.4 Specifications
                         </a>
                         download page at
                         <code>java.sun.com</code>
                     </li>
                     <li>
                         <a href="http://java.sun.com/j2ee/tutorial/1_3-fcs/doc/Servlets.html">
-                            <strong>Java Servlet Technology</strong>
+                            Java Servlet Technology
                         </a>
                         in The J2EE Tutorial.
                     </li>
@@ -1023,8 +1022,8 @@
             <subsection name="0.7.6 Sessions">
 
                 <p>One of the key characteristics of HTTP is that it is
-                    <em>stateless</em>
-                    . In other words, there is nothing built in to
+                    <em>stateless.</em>
+                    In other words, there is nothing built in to
                     HTTP that identifies a subsequent request from the same
                     user as being
                     related to a previous request from that user. This makes
@@ -1057,7 +1056,7 @@
                     (in JSP, they are known as "session scope beans").
                 </p>
 
-                <p>To avoid occupying resources forever when a user fails to
+                <p>To avoid occupying resources indefinately when a user fails to
                     complete
                     an interaction, sessions have a configurable
                     <em>timeout interval.</em>
@@ -1192,6 +1191,29 @@
                     information in a database.
                 </p>
 
+                <p>
+                    For more about security, see:
+                </p>
+                <ul>
+                    <li>
+                        <a href="http://java.sun.com/blueprints/guidelines/designing_enterprise_applications/security/index.html">
+                          J2EE Blueprints: Security</a>
+                    </li>
+                    <li>
+                        <a href="http://securityfilter.sourceforge.net/">
+                            SecurityFilter
+                        </a>
+                    </li>
+                    <li>
+                        <a href="http://acegisecurity.org/">
+                            Acegi Security</a>
+                    </li>
+                    <li>
+                        <a href="http://sslext.sourceforge.net/">
+                            The Struts SSL Extension for HTTP/HTTPS switching </a>
+                    </li>
+                </ul>
+
             </subsection>
 
             <a name="jsp"/>
@@ -1233,29 +1255,29 @@
                 <ul>
                     <li>
                         <a href="http://java.sun.com/products/jsp/">
-                            <strong>The
-                                JavaServer Pages Technology</strong>
+                            The
+                                JavaServer Pages Technology
                         </a>
                         page at
                         <code>java.sun.com</code>
                     </li>
                     <li>
                         <a href="http://java.sun.com/products/jsp/reference/api/index.html">
-                            <strong>The
-                                JSP 1.2 and 2.0 Specifications</strong>
+                            The
+                                JSP 1.2 and 2.0 Specifications
                         </a>
                         download page at
                         <code>java.sun.com</code>
                     </li>
                     <li>
                         <a href="http://java.sun.com/j2ee/tutorial/1_3-fcs/doc/JSPIntro.html">
-                            <strong>JavaServer Pages Technology</strong>
+                            JavaServer Pages Technology
                         </a>
                         in The J2EE Tutorial
                     </li>
                     <li>
                         <a href="http://java.sun.com/j2ee/tutorial/1_3-fcs/doc/JSPTags.html">
-                            <strong>Custom Tags in JSP Pages</strong>
+                            Custom Tags in JSP Pages
                         </a>
                         in The J2EE Tutorial
                     </li>
@@ -1272,7 +1294,7 @@
 
                 <p>The framework also works well with the
                     <a href="http://java.sun.com/products/jsp/jstl">
-                        <strong>JavaServer Pages Standard Tag Library</strong>
+                        JavaServer Pages Standard Tag Library
                     </a>
                     (JSTL) and taglibs from other sources, like
                     <a href="http://jsptags.com/">JSP Tags,</a>
@@ -1313,16 +1335,15 @@
                         JavaServer Faces technology.</a>
                     JSF simplifies building user interfaces for JavaServer
                     applications, both for the web and for the desktop.
-                    To keep pace, Struts 2 has support for this new technology, allowing
-                    Struts pages to use JSF components.
                     For teams looking for a step-wise transition to JSF and Struts 1, we
                     offer Struts-Faces taglib,
                     which lets you use JSF components with your existing
-                    Actions.
+                    Actions, so that you can migate to JSF one page a time. 
                 </p>
                 <p>
                     For an open source implementation of JSF, visit our
-                    sibling project.
+                    sibling project, <a href="httpL//myfaces.apache.org">
+                    Apache MyFaces.</a>
                 </p>
 
                 <p>For more about JSTL and JavaServer Faces see</p>
@@ -1335,13 +1356,13 @@
                     </li>
                     <li>
                         <a href="http://www.jsfcentral.com">
-                            <strong>JSF Central</strong>
+                            JSF Central
                         </a>
                         - JavaServer Faces resources.
                     </li>
                     <li>
                         <a href="http://www.jamesholmes.com/JavaServerFaces/">
-                            <strong>JavaServer Faces Resources</strong>
+                            JavaServer Faces Resources
                         </a>
                         - James Holmes dot Com.
                     </li>

Modified: struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml?rev=419872&r1=419871&r2=419872&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml (original)
+++ struts/struts1/trunk/src/site/xdoc/userGuide/release-notes.xml Fri Jul  7 04:32:46 2006
@@ -22,7 +22,7 @@
         <title>Release Notes (since 1.3.3)</title>
     </properties>
     <body>
-        <section name="6.1 Release Notes - Version 1.3.4">
+        <section name="6.1 Release Notes - Version 1.3.5">
 
             <subsection>
                 <p>
@@ -96,7 +96,7 @@
                 <p>
                     You can also access to the Apache Struts source repository and
                     change logs directly through both
-                    <a href="http://svn.apache.org/viewcvs.cgi/struts/action/trunk/?root=Apache-SVN">
+                    <a href="http://svn.apache.org/viewcvs.cgi/struts/struts1/trunk/?root=Apache-SVN">
                         web browser</a>
                     and
                     <a href="http://www.apache.org/dev/version-control.html">
@@ -104,17 +104,17 @@
                     interfaces.
                 </p>
 
-                <h3>Struts</h3>
+                <h3>Components</h3>
 
                 <p>
-                    The Struts 1.3.4 distribution contains the following eight
+                    The Struts 1.3.5 distribution contains the eight
                     components: Core, Applications, EL, Extras, Faces, 
                     Scripting, Taglib, and Tiles.
                 </p>
 
                 <p>
-                    The Struts, including the website, is being
-                    built with Maven 2.
+                    The entire Struts distribution, including the website, 
+                    is being built with Maven 2.
                     But, of course, you can continue to build your own
                     projects any way you like!
                 </p>
@@ -151,18 +151,34 @@
 <p>The following issues have been resolved since the 1.3.3 test build:</p>
 <h4>Bugs</h4>
 <ul>
-<li>[<a href='http://issues.apache.org/struts/browse/STR-2795'>STR-2795</a>] - Postback Forms - Caching and Modules</li>
-<li>[<a href='http://issues.apache.org/struts/browse/STR-2866'>STR-2866</a>] - Struts Tiles jar is missing dtd, tld and chain config files</li>
-<li>[<a href='http://issues.apache.org/struts/browse/STR-2867'>STR-2867</a>] - Dependency problems in faces-example2 sample app (using Tiles)</li>
-<li>[<a href='http://issues.apache.org/struts/browse/STR-2870'>STR-2870</a>] - The Specification-Title in the jar file manifests is corrupted</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2901'>STR-2901</a>] - Map-backed forms won't work with ')' characters in keys</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2890'>STR-2890</a>] - DEFINE tag causes compilation issues</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2887'>STR-2887</a>] - TagUtils.instance is private final. Please allow to change the instance with a custom one! Maybe put it protected only!</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2883'>STR-2883</a>] - The command/action corresponding to RequestProcessor.processCachedMessages() method appears to be missing in 1.3</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2881'>STR-2881</a>] - PerformForward command not honoring "module" property of ForwardConfig</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2879'>STR-2879</a>] - when used in modules, TilesPreProcessor not backwards compatible with 1.2.x</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2877'>STR-2877</a>] - TestModuleConfig fails when run offline</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2876'>STR-2876</a>] - Tiles 1.1 DTD registration is missing from XmlParser</li>
 <li>[<a href='http://issues.apache.org/struts/browse/STR-2872'>STR-2872</a>] - Section "4.3.3 Map-backed ActionForms" of User's Manual contains a dead link</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2870'>STR-2870</a>] - The Specification-Title in the jar file manifests is corrupted</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2866'>STR-2866</a>] - Struts Tiles jar is missing dtd, tld and chain config files</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2862'>STR-2862</a>] - Cannot load a validator resource from '/WEB-INF/validator-rules.xml</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2859'>STR-2859</a>] - When using &lt;html:html xhtml="true"&gt; the form name is not used but the id, and the client validation using javascript fails</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2795'>STR-2795</a>] - Postback Forms - Caching and Modules</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2527'>STR-2527</a>] - Attributes with &lt;rtexprvalue>false&lt;/rtexprvalue> in TLD prevent EL evaluation</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2496'>STR-2496</a>] - [struts-faces] Example applications don't work?!</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2493'>STR-2493</a>] - [struts-faces] ErrorsRenderer assumes ActionErrors</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-1892'>STR-1892</a>] - timezone support for bean:write tag</li>
 </ul>
             
 <h4>Tasks</h4>
 <ul>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2898'>STR-2898</a>] - Rename Struts Action 1 to Struts 1</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2892'>STR-2892</a>] - Remove old cactus config  </li>
 <li>[<a href='http://issues.apache.org/struts/browse/STR-2871'>STR-2871</a>] - Rename the release notes so that the filename contains a single period</li>
+<li>[<a href='http://issues.apache.org/struts/browse/STR-2853'>STR-2853</a>] - Configure the CheckStyle plugin to use the struts_checks.xml file</li>
 </ul>
-            
+
             </subsection>
 
             <subsection>