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/15 17:07:32 UTC

svn commit: r422247 - in /struts/site: ./ src/site/ src/site/xdoc/

Author: husted
Date: Sat Jul 15 08:07:31 2006
New Revision: 422247

URL: http://svn.apache.org/viewvc?rev=422247&view=rev
Log:
STR-2910 Move preface from Struts 1 to Site as Key Technologies Primer so that it can be shared with Struts 2

Added:
    struts/site/src/site/xdoc/preface.xml
      - copied, changed from r421880, struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml
Modified:
    struts/site/pom.xml
    struts/site/src/site/site.xml
    struts/site/src/site/xdoc/announce-2003.xml
    struts/site/src/site/xdoc/announce-2004.xml
    struts/site/src/site/xdoc/announce-2005.xml
    struts/site/src/site/xdoc/announce.xml
    struts/site/src/site/xdoc/bylaws.xml
    struts/site/src/site/xdoc/faqs.xml
    struts/site/src/site/xdoc/index.xml
    struts/site/src/site/xdoc/mail.xml
    struts/site/src/site/xdoc/volunteers.xml

Modified: struts/site/pom.xml
URL: http://svn.apache.org/viewvc/struts/site/pom.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/pom.xml (original)
+++ struts/site/pom.xml Sat Jul 15 08:07:31 2006
@@ -64,5 +64,16 @@
       <url>scp://people.apache.org/www/struts.apache.org/</url>
     </site>
   </distributionManagement>
-
+  
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.0-beta-4</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    
 </project>

Modified: struts/site/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/site.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/site.xml (original)
+++ struts/site/src/site/site.xml Sat Jul 15 08:07:31 2006
@@ -3,18 +3,18 @@
     <bannerLeft>
         <name>Apache Software Foundation</name>
         <src>http://www.apache.org/images/asf-logo.gif</src>
-        <href>http://www.apache.org</href>
+        <href>http://www.apache.org/</href>
     </bannerLeft>
     <bannerRight>
         <name>Apache Struts</name>
         <src>http://struts.apache.org/images/struts.gif</src>
-        <href>http://struts.apache.org</href>
+        <href>http://struts.apache.org/</href>
     </bannerRight>     
     <body>
         <links>
             <item name="Apache" href="http://www.apache.org" /> 
-            <item name="Struts 1" href="http://struts.apache.org/1.x" />
-            <item name="Struts 2" href="http://struts.apache.org/2.0" />
+            <item name="Struts 1" href="http://struts.apache.org/1.x/" />
+            <item name="Struts 2" href="http://struts.apache.org/2.0/" />
         </links>
 
         <menu name="Apache Struts Project">
@@ -30,6 +30,10 @@
                     name="FAQs"
                     href="faqs.html"
                     />
+            <item 
+                    name="Key Technologies"
+                    href="primer.html"
+                    />
         </menu>
 
         <menu name="Community">
@@ -80,12 +84,12 @@
 
         <menu name="Development">
             <item
-                    name="Who We Are"
-                    href="volunteers.html"
+                    name="PMC Charter"
+                    href="bylaws.html"
                     />
             <item
-                    name="Charter"
-                    href="bylaws.html"
+                    name="Volunteers"
+                    href="volunteers.html"
                     />
             <item
                     name="Release Guidelines"

Modified: struts/site/src/site/xdoc/announce-2003.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2003.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce-2003.xml (original)
+++ struts/site/src/site/xdoc/announce-2003.xml Sat Jul 15 08:07:31 2006
@@ -25,6 +25,10 @@
     <body>
 
         <section name="Announcements - 2003">
+
+            <p class="right">
+                Skip to: <a href="announce-2002.html">Announcements - 2002 and prior</a>
+            </p>
         
             <h4 id="a20030630">30 Jun 2003 - Struts 1.1 Final released</h4>
             <p>

Modified: struts/site/src/site/xdoc/announce-2004.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2004.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce-2004.xml (original)
+++ struts/site/src/site/xdoc/announce-2004.xml Sat Jul 15 08:07:31 2006
@@ -26,6 +26,10 @@
 
         <section name="Announcements - 2004">
         
+            <p class="right">
+                Skip to: <a href="announce-2003.html">Announcements - 2003</a>
+            </p>
+
             <h4 id="a20041212">12 Dec 2004 - Struts 1.2.6 (Beta)</h4>
             <p>
                 The Struts team is pleased to announce the release of Struts

Modified: struts/site/src/site/xdoc/announce-2005.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce-2005.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce-2005.xml (original)
+++ struts/site/src/site/xdoc/announce-2005.xml Sat Jul 15 08:07:31 2006
@@ -26,6 +26,11 @@
 
         <section name="Announcements - 2005">
         
+            <p class="right">
+                Skip to: <a href="announce-2004.html">Announcements - 2004</a>
+            </p>
+        
+        
             <h4 id="a20051218.1">18 Dec 2005 - New Struts Committer: Richard
                 Feit</h4>
             <p>
@@ -220,7 +225,7 @@
                 for JSF</h4>
                 
             <p>[Note: <a href="http://shale.apache.org/">
-            		Shale is now a top-level ASF project.</a>]
+                    Shale is now a top-level ASF project.</a>]
             </p>
             
             <p>

Modified: struts/site/src/site/xdoc/announce.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/announce.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/announce.xml (original)
+++ struts/site/src/site/xdoc/announce.xml Sat Jul 15 08:07:31 2006
@@ -26,6 +26,10 @@
 
         <section name="Announcements">
 
+            <p class="right">
+                Skip to: <a href="announce-2005.html">Announcements - 2005</a>
+            </p>
+
             <h4 id="a20060628.1">28 Jun 2006 - Shale to Become Top-Level
                 ASF Project</h4>            
             <p>
@@ -86,90 +90,90 @@
             <hr/>
 
             <h4 id="a20060603.3">03 Jun 2006 - New Struts Committer: 
-            	Bob Lee</h4>            
+                Bob Lee</h4>            
             <p>
-		Please join us in welcoming Bob Lee as a new Struts committer. 
+        Please join us in welcoming Bob Lee as a new Struts committer. 
             </p>
             <p>
-		Some of us have known Bob for several years through his Struts, 
-		WebWork, and Dynaop work, or in person from a conference. 
-		At this last JavaOne, he met other PMC members: Craig, Martin, 
-		Gary, and Wendy -- and Bob is well known to the WebWork folks.
+        Some of us have known Bob for several years through his Struts, 
+        WebWork, and Dynaop work, or in person from a conference. 
+        At this last JavaOne, he met other PMC members: Craig, Martin, 
+        Gary, and Wendy -- and Bob is well known to the WebWork folks.
             </p>
             <p>
-		Bob's current focus is to develop a kinder, gentler API for 
-		Struts 2, having already submitted several patches and 
-		<a href="http://wiki.apache.org/struts/RoughSpots">
-		constructively engaged the community</a> 
-		while handling criticisms well. He has committed several 
-		patches for WebWork and Xwork, started the Dynaop project, 
-		and has been peripherally involved in the Struts community 
-		for many years.  
+        Bob's current focus is to develop a kinder, gentler API for 
+        Struts 2, having already submitted several patches and 
+        <a href="http://wiki.apache.org/struts/RoughSpots">
+        constructively engaged the community</a> 
+        while handling criticisms well. He has committed several 
+        patches for WebWork and Xwork, started the Dynaop project, 
+        and has been peripherally involved in the Struts community 
+        for many years.  
             </p>
             <p>
-		Welcome, Bob  ... Our only worry is that we haven't yet seen 
-		the Crazy part of Crazy Bob.
+        Welcome, Bob  ... Our only worry is that we haven't yet seen 
+        the Crazy part of Crazy Bob.
             </p>
             <p>
-		PMC vote: 8 +1 (binding), 4 +1 (non-binding).            
+        PMC vote: 8 +1 (binding), 4 +1 (non-binding).            
             </p>
             <hr/>
             
             <h4 id="a20060603.2">03 Jun 2006 - New Struts Committer: Michael 
-            	Jouravlev</h4>            
+                Jouravlev</h4>            
             <p>
-		Please join us in welcoming Michael Jouravlev as a new Struts 
-		committer. 
+        Please join us in welcoming Michael Jouravlev as a new Struts 
+        committer. 
             </p>
             <p>
-		Michael has been an active member of our community for a very 
-		long time. His posts to user@ and dev@ are consistently 
-		helpful. Michael often participates in development 
-		discussions, including the Action2 discussions. He has 
-		<a href="http://tinyurl.com/ls7ga">
-		submitted code and patches and collaborated on changes</a> 
-		that were accepted to the code base.
+        Michael has been an active member of our community for a very 
+        long time. His posts to user@ and dev@ are consistently 
+        helpful. Michael often participates in development 
+        discussions, including the Action2 discussions. He has 
+        <a href="http://tinyurl.com/ls7ga">
+        submitted code and patches and collaborated on changes</a> 
+        that were accepted to the code base.
             </p>
             <p>
-		Michael has also make many contributions to the wiki, 
-		including reorganizing the area so that it is more useful to 
-		others.
+        Michael has also make many contributions to the wiki, 
+        including reorganizing the area so that it is more useful to 
+        others.
             </p>
             <p>
-		Welcome, Michael ... Just don't start downsizing the fonts :)
+        Welcome, Michael ... Just don't start downsizing the fonts :)
             </p>
             <p>
-		PMC vote: 7 +1.            
+        PMC vote: 7 +1.            
             </p>
             <hr/>
 
             <h4 id="a20060603.1">03 Jun 2006 - New Struts Committer: Paul 
-            	Benedict</h4>
+                Benedict</h4>
             <p>
-		Please join us in welcoming Paul Benedict as a new Struts 
-		committer. 
-	    </p>
-	    <p>
-	    	Paul has been an earnest and helpful member of our community 
-	    	for well over a year now. He has submitted patches and ideas, 
-	    	andvmany useful posts to the user list. Paul was particularly 
-		active in the 
-		<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38374">
-		discussion</a> 
-		that lead to the addition of the "Opt-in Cancel" feature, 
-	    </p>
-	    <p>
-		In this and other discussions, Paul has demonstrated an 
-		ability to collaborate with others and create a better 
-		solution than the one originally proposed. 
- 	    </p>
-	    <p>
-		Welcome, Paul ... Hey, we're always looking for release
-		managers! 
- 	    </p>
-	    <p>
-	    	PMC vote: 3 +1.
- 	    </p>
+        Please join us in welcoming Paul Benedict as a new Struts 
+        committer. 
+        </p>
+        <p>
+            Paul has been an earnest and helpful member of our community 
+            for well over a year now. He has submitted patches and ideas, 
+            andvmany useful posts to the user list. Paul was particularly 
+        active in the 
+        <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=38374">
+        discussion</a> 
+        that lead to the addition of the "Opt-in Cancel" feature, 
+        </p>
+        <p>
+        In this and other discussions, Paul has demonstrated an 
+        ability to collaborate with others and create a better 
+        solution than the one originally proposed. 
+        </p>
+        <p>
+        Welcome, Paul ... Hey, we're always looking for release
+        managers! 
+        </p>
+        <p>
+            PMC vote: 3 +1.
+        </p>
             <hr/>
             
             <h4 id="a20050328">23 Mar 2006 - Struts Shale Framework 1.0.2 Alpha</h4>
@@ -330,7 +334,7 @@
 
         <section>
             <p class="right">
-                <a href="announce-2005.html">Announcements - 2005</a>
+                Skip to: <a href="announce-2005.html">Announcements - 2005</a>
             </p>
         </section>
 

Modified: struts/site/src/site/xdoc/bylaws.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/bylaws.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/bylaws.xml (original)
+++ struts/site/src/site/xdoc/bylaws.xml Sat Jul 15 08:07:31 2006
@@ -434,7 +434,7 @@
         <section>
             <p class="right">
                 Next:
-                <a href="releases.html">Release Guidelines</a>
+                <a href="volunteers.html">Volunteers</a>
             </p>
         </section>
 

Modified: struts/site/src/site/xdoc/faqs.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/faqs.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/faqs.xml (original)
+++ struts/site/src/site/xdoc/faqs.xml Sat Jul 15 08:07:31 2006
@@ -48,7 +48,7 @@
         <section>
             <p class="right">
                 <strong>Next:</strong>
-                <a href="kickstart.html">Kickstart FAQ</a>
+                <a href="primer.html">Key Technologies</a>
             </p>
         </section>
 

Modified: struts/site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/index.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/index.xml (original)
+++ struts/site/src/site/xdoc/index.xml Sat Jul 15 08:07:31 2006
@@ -57,13 +57,13 @@
                  and the <em>Controller</em> represents the navigational code. 
                  The Struts framework is designed to help developers create 
                  web applications that utilize a MVC architecture. 
-                        </p>
+            </p>
 
             <p>
-                           The framework provides three key components:
-                        </p>
+                  The framework provides three key components:
+           </p>
                          
-                        <ul>
+                    <ul>
                         <li>
                             An extensible "front controller" that dispatches requests to  
                             an "action" handler provided by the application developer. 
@@ -76,7 +76,7 @@
                            A tag library that helps developers create interactive 
                            form-based applications.
                         </li>
-                        </ul>
+                    </ul>
                         
             <p>
                 The framework's architecture and tags are buzzword compliant. 

Modified: struts/site/src/site/xdoc/mail.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/mail.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/mail.xml (original)
+++ struts/site/src/site/xdoc/mail.xml Sat Jul 15 08:07:31 2006
@@ -92,13 +92,13 @@
                 </p>
                 
                 <p>
-                	Conversely, a question about the future of Struts 
-                	or the operation of the Struts project is best posted to the 
-	                dev list. 
-	                The focus of the user list should be one "how" to do 
-	                something with the framework we have today. 
-	                The focus of the dev list is how we want to do something 
-	                with a future version of the framework. 
+                    Conversely, a question about the future of Struts 
+                    or the operation of the Struts project is best posted to the 
+                    dev list. 
+                    The focus of the user list should be one "how" to do 
+                    something with the framework we have today. 
+                    The focus of the dev list is how we want to do something 
+                    with a future version of the framework. 
                 </p>
                 <p>
                     <strong>
@@ -502,7 +502,7 @@
         <section>
             <p class="right">
                 <strong>Next:</strong>
-                <a href="volunteers.html">Who we are</a>
+                <a href="bylaws.html">PMC Charter</a>
             </p>
         </section>
 

Copied: struts/site/src/site/xdoc/preface.xml (from r421880, struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml)
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/preface.xml?p2=struts/site/src/site/xdoc/preface.xml&p1=struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml&r1=421880&r2=422247&rev=422247&view=diff
==============================================================================
--- struts/struts1/trunk/src/site/xdoc/userGuide/preface.xml (original)
+++ struts/site/src/site/xdoc/preface.xml Sat Jul 15 08:07:31 2006
@@ -19,12 +19,12 @@
 <document>
 
     <properties>
-        <title>Preface: Key Technologies</title>
+        <title>Key Technologies Primer</title>
     </properties>
 
     <body>
 
-        <section name="0. Preface: Key Technologies">
+        <section name="Key Technologies Primer">
 
             <blockquote><p><em>
             "The time has come," the Walrus said, "To talk of many things: 
@@ -32,12 +32,13 @@
             And why the sea is boiling hot -- And whether pigs have wings." 
             </em></p></blockquote>
 
+
             <a name="suspects"/>
-            <subsection name="0.1 The Usual Suspects">
+            <subsection name="The Usual Suspects">
 
                 <p>
-                    This User Guide is written for active web developers and
-                    assumes a working
+                    The framework documentation is written for active web 
+                    developers and assumes a working
                     knowledge about how Java web applications are built.
                     Before getting started, you should
                     understand the basics of several key technologies:
@@ -78,9 +79,9 @@
                         <a href="#layers">Other Layers</a>
                     </li>
                 </ul>
-
+                
                 <p>
-                    This chapter briefly defines each of these technologies
+                    This primer briefly defines each of these technologies
                     but does not describe them in detail.
                     For your convenience, links to further information are
                     provided if you would like to learn more about a
@@ -129,7 +130,7 @@
             </subsection>
 
             <a name="http"/>
-            <subsection name="0.2 HTTP, HTML and User Agents">
+            <subsection name="HTTP, HTML and User Agents">
 
                 <p>The World Wide Web was built over the Hypertext Transfer
                     Protocol
@@ -189,7 +190,7 @@
             </subsection>
 
             <a name="cycle"/>
-            <subsection name="0.3 The HTTP Request/Response cycle">
+            <subsection name="The HTTP Request/Response cycle">
 
                 <p>A very important part of HTTP for the web developer is the
                     request/response cycle. To use HTTP
@@ -214,7 +215,7 @@
 
             <a name="java"/>
             <subsection
-                    name="0.4 The Java Language and Application Frameworks">
+                    name="The Java Language and Application Frameworks">
 
                 <p>The framework is written in the popular and versatile
                     <a href="http://java.sun.com/docs/books/jls/first_edition/html/index.html">
@@ -282,75 +283,8 @@
 
             </subsection>
 
-            <a name="chain"/>
-            <subsection name="0.4.1 Chain of Responsibility">
-
-                <p>
-                    A popular technique for organizing the execution of
-                    complex
-                    processing flows is the "Chain of Responsibility" pattern,
-                    as described (among many other places) in the classic
-                    <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0201633612/apachesoftwar-20/">
-                        "Gang of Four" design patterns book.</a>
-                    The GoF summarizes the Chain of Responsibility pattern as
-                    "Avoid coupling the sender of a request to its receiver
-                    by giving more than one object a chance to handle the
-                    request.
-                    Chain the receiving objects
-                    and pass the request along the chain until an object
-                    handles it."
-                </p>
-
-                <p>
-                    The CoR pattern helps us keep software components loosely
-                    coupled.
-                    A component can call a Chain of Responsbility,
-                    without knowing what objects are on the chain or how they
-                    are
-                    implemented.
-                    Most importantly, we can adjust the Chain without changing
-                    how callers invoke the Chain.
-                    As of version 1.3,
-                    the default Request Processor,
-                    which acts as the framework's "kernal",
-                    is a Chain of Responsiblity.
-                </p>
-
-                <p>
-                    To implement its Chain, the Request Processor uses the
-                    <a href="http://jakarta.apache.org/commons/chain/">
-                        Chain of Responsibility</a>
-                    component in the Jakarta Commons
-                    which provides a standard implementation of the CoR
-                    pattern,
-                    along with various implementations of the Context and
-                    Command objects used by the Chain to service a request.
-                </p>
-
-                <p>
-                    For more about Chain of Responsiblity, see
-                </p>
-
-                <ul>
-                    <li>
-                        <a href="http://jakarta.apache.org/commons/chain/">
-                            Jakarta Commons Chain of Responsibility</a>
-                    </li>
-                    <li>
-                        <a href="http://www.onjava.com/lpt/a/5671">
-                            A look at Commons Chain</a>
-                    </li>
-                    <li>
-                        <a href="http://www.infonoia.com/en/content.jsp?d=inf.05.06&amp;pr=1">
-                            Better Code with Struts 1.3
-                        </a>
-                    </li>
-                </ul>
-
-            </subsection>
-
             <a name="javabeans"/>
-            <subsection name="0.5 JavaBeans">
+            <subsection name="JavaBeans">
 
                 <p>Like many Java applications, most of the framework objects
                     are designed as
@@ -398,7 +332,7 @@
             </subsection>
 
             <a name="reflection"/>
-            <subsection name="0.5.1 Reflection and Introspection">
+            <subsection name="Reflection and Introspection">
 
                 <p>
                     Reflection is the process of determining which member
@@ -436,7 +370,7 @@
             </subsection>
 
             <a name="maps"/>
-            <subsection name="0.5.2 Maps">
+            <subsection name="Maps">
 
                 <p>
                     JavaBeans store data as properties and may act on that
@@ -452,53 +386,9 @@
 
             </subsection>
 
-            <a name="dynabeans"/>
-            <subsection name="0.5.3 DynaBeans">
-
-                <p>
-                    DynaBeans combine the extensibility of JavaBeans with the
-                    flexibility of a Map.
-                    Defining even the simplest JavaBean requires defining a
-                    new class and coding a field and two methods for each
-                    property.
-                    The properties of a DynaBean can be configured via an XML
-                    descriptor.
-                    The virtual properties of a DynaBean can't be called by
-                    standard Java methods,
-                    but work well with components that rely on reflection and
-                    introspection.
-                </p>
-
-                <p>
-                    In your application, you can use DynaBeans to describe
-                    your HTML forms.
-                    This strategy can avoid creating a formal JavaBean
-                    subclass to store a few simple properties.
-                </p>
-
-                <p>
-                    For more about DynaBeans, see
-                </p>
-
-                <ul>
-                    <li>
-                        The Commons BeanUtils
-                        <a href="http://jakarta.apache.org/commons/beanutils/api/org/apache/commons/beanutils/package-summary.html#package_description">
-                            Package Description</a>
-                        and
-                        <a href="http://jakarta.apache.org/commons/beanutils/api/index.html">
-                            Javadocs.</a>
-                    </li>
-                    <li>
-                        <a href="https://formdef.dev.java.net/">Struts
-                            FormDef</a>
-                    </li>
-                </ul>
-
-            </subsection>
 
             <a name="resources"/>
-            <subsection name="0.6 Properties Files and ResourceBundles">
+            <subsection name="Properties Files and ResourceBundles">
 
                 <p>Java applications, including web applications, are often
                     configured using
@@ -546,7 +436,7 @@
             </subsection>
 
             <a name="servlets"/>
-            <subsection name="0.7 Java Servlets">
+            <subsection name="Java Servlets">
                 <p>
                     Since Java is an object-orientated language, the
                     <a href="http://www.novocode.com/doc/servlet-essentials/">
@@ -675,7 +565,7 @@
             </subsection>
 
             <a name="threads"/>
-            <subsection name="0.7.1 Servlets and threads">
+            <subsection name="Servlets and Threads">
 
                 <p>
                     To boost performance, the container can multi-thread
@@ -710,7 +600,7 @@
             </subsection>
 
             <a name="context"/>
-            <subsection name="0.7.2 Servlet Context">
+            <subsection name="Servlet Context">
 
                 <p>The
                     <em>ServletContext</em>
@@ -773,7 +663,7 @@
             </subsection>
 
             <a name="request"/>
-            <subsection name="0.7.3 Servlet Request">
+            <subsection name="Servlet Request">
 
                 <p>Each request processed by a servlet is represented by a
                     Java
@@ -878,7 +768,7 @@
             </subsection>
 
             <a name="response"/>
-            <subsection name="0.7.4 Servlet Response">
+            <subsection name="Servlet Response">
 
                 <p>The primary purpose of a servlet is to process an incoming
                     <a href="#request">Servlet Request</a>
@@ -981,7 +871,7 @@
             </subsection>
 
             <a name="filter"/>
-            <subsection name="0.7.5 Filtering">
+            <subsection name="Filtering">
 
                 <p>If you are using a servlet container based on version
                     <strong>2.3</strong>
@@ -1025,7 +915,7 @@
             </subsection>
 
             <a name="session"/>
-            <subsection name="0.7.6 Sessions">
+            <subsection name="Sessions">
 
                 <p>One of the key characteristics of HTTP is that it is
                     <em>stateless.</em>
@@ -1129,7 +1019,7 @@
             </subsection>
 
             <a name="dispatch"/>
-            <subsection name="0.7.7 Dispatching Requests">
+            <subsection name="Dispatching Requests">
 
                 <p>
                     The Java Servlet specification extends the HTTP
@@ -1148,7 +1038,7 @@
             </subsection>
 
             <a name="webapp"/>
-            <subsection name="0.7.8 Web Applications">
+            <subsection name="Web Applications">
 
                 <p>
                     Just as a HTTP server can be used to host several distinct
@@ -1169,7 +1059,7 @@
 
             <a name="events"/>
             <subsection
-                    name="0.7.9 Web application deployment descriptor (web.xml)">
+                    name="Web application deployment descriptor (web.xml)">
 
                 <p>
                     Most aspects of an application's lifecycle are configured
@@ -1182,7 +1072,7 @@
             </subsection>
 
             <a name="security"/>
-            <subsection name="0.7.10 Security" href="">
+            <subsection name="Security">
 
                 <p>
                     One detail that can be configured in the Web application
@@ -1224,7 +1114,7 @@
 
             <a name="jsp"/>
             <subsection
-                    name="0.8 JavaServer Pages, JSP Tag Libraries, and JavaServer Faces"
+                    name="JavaServer Pages, JSP Tag Libraries, and JavaServer Faces"
                     href="">
                 <p>
                     <a href="http://java.sun.com/products/jsp/product.html">
@@ -1339,12 +1229,8 @@
                     The newest star on the Java horizon is
                     <a href="http://java.sun.com/j2ee/javaserverfaces/">
                         JavaServer Faces technology.</a>
-                    JSF simplifies building user interfaces for JavaServer
+                    JSF aims to simplify building user interfaces for JavaServer
                     applications, both for the web and for the desktop.
-                    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, so that you can migate to JSF one page a time. 
                 </p>
                 <p>
                     For an open source implementation of JSF, visit our
@@ -1378,11 +1264,11 @@
                         the JSF specification.
                     </li>
                 </ul>
-
+                
             </subsection>
 
             <a name="xml"/>
-            <subsection name="0.9 Extensible Markup Language (XML)" href="">
+            <subsection name="Extensible Markup Language (XML)">
 
                 <p>The features provided by the framework rely on a number of
                     objects that are
@@ -1405,8 +1291,9 @@
                 </p>
 
             </subsection>
+            
             <a name="descriptors"/>
-            <subsection name="0.9.1 Descriptors" href="descriptors">
+            <subsection name="Descriptors">
 
                 <p>
                     When Java applications use XML configuration files,
@@ -1427,7 +1314,7 @@
             </subsection>
 
             <a name="jaas"/>
-            <subsection name="0.10 JAAS" href="">
+            <subsection name="JAAS">
 
                 <p>
                     While the framework can work with any approach to user
@@ -1455,7 +1342,7 @@
             </subsection>
 
             <a name="layers"/>
-            <subsection name="0.11 Other layers">
+            <subsection name="Other layers">
 
                 <p>
                     The framework provides the control layer for a web
@@ -1466,31 +1353,116 @@
                     layers.
                 </p>
 
+
+            </subsection>
+                        
+            <a name="logic_frameworks"/>
+            <subsection name="Business Logic Frameworks">
+
                 <p>
-                    For more about creating business and data access layers,
-                    see the 
-                    <a href="building_model.html">Building Model
-                        Components</a>
-                    section.
+                    Most teams still roll their own business logic layer using
+                    plain old JavaBeans (POJOs).
+                    Though, business layer frameworks are beginning to emerge,
+                    and now include:
                 </p>
+                <ul>
+                    <li>
+                        <a href="http://jakarta.apache.org/commons/chain/">
+                            Commons Chain of Responsiblity</a>
+                    </li>
+                    <li>
+                        <a href="http://springframework.org/">Spring</a>
+                    </li>
+                    <li>
+                        <a href="http://www.opensymphony.com/xwork/">XWork</a>
+                    </li>
+                </ul>
+
+            </subsection>
+                   
+            <a name="data_frameworks"/>
+            <subsection name="Data Access Frameworks">
 
                 <p>
-                    For more about creating the presentation layer,
-                    see the
-                    <a href="building_model.html">Building View Components</a>
-                    section.
+                    Most often, the business layer is seen to be distinct from
+                    the data access layer.
+                    Some teams roll their own data access objects (DAOs),
+                    but more and more teams are turning to one of the many
+                    data access frameworks.
+                    Some popular data access frameworks include:
                 </p>
 
-            </subsection>
+                <ul>
+                
+                    <li>
+                        <a href="http://www.objectstyle.org/cayenne/">
+                            Cayenne</a>
+                    </li>
+                    <li>
+                        <a href="http://java.sun.com/products/ejb/index.html">
+                            Enterprise Java Beans</a>
+                    </li>
+                    <li>
+                        <a href="http://www.hibernate.org/">
+                            Hibernate</a>
+                    </li>
+                    <li>
+                        <a href="http://ibatis.apache.org">
+                            iBATIS</a>
+                    </li>
+                    <li>
+                        <a href="http://java.sun.com/products/jdbc/index.html">
+                            JDBC</a>
+                    </li>
+                    <li>
+                        <a href="http://db.apache.org/ojb/">
+                            Object Relational Bridge</a>
+                    </li>
+                </ul>
 
-        </section>
+            </subsection>        
+            
+            
+            <a name="view_frameworks"/>
+            <subsection name="View Frameworks">
+                <p>
+                    Aside from Java Server Pages, there are several other 
+                    presentation technologies available to Java web applications. 
+                </p>
+                
+                <ul>
+                    <li>
+                        <a href="http://www.freemarker.org/">
+                            Freemarker</a>
+                    </li>
+                    <li>
+                        <a href="http://www.lowagie.com/iText/">
+                            iText (PDF)</a>
+                    </li>
+                    <li>
+                        <a href="http://jaspersoft.com/">
+                            JasperReports</a>
+                    </li>
+                    <li>
+                        <a href="http://jakarta.apache.org/velocity/">
+                            Velocity</a>
+                    </li>
+                    <li>
+                        <a href="http://www.w3.org/TR/xslt">XLST</a>
+                    </li>
+                </ul>
 
+            </subsection>
+            
+           </section>
+           
         <section>
             <p class="right">
-                Next:
-                <a href="introduction.html">Introduction</a>
+                <strong>Next:</strong>
+                <a href="mail.html">Mailing Lists</a>
             </p>
         </section>
-
+           
+           
     </body>
 </document>

Modified: struts/site/src/site/xdoc/volunteers.xml
URL: http://svn.apache.org/viewvc/struts/site/src/site/xdoc/volunteers.xml?rev=422247&r1=422246&r2=422247&view=diff
==============================================================================
--- struts/site/src/site/xdoc/volunteers.xml (original)
+++ struts/site/src/site/xdoc/volunteers.xml Sat Jul 15 08:07:31 2006
@@ -19,11 +19,18 @@
 <document>
 
     <properties>
-        <title>Who We Are</title>
+        <title>Volunteers</title>
     </properties>
 
     <body>
-        <section name="Who We Are">
+        <section name="Volunteers">
+                
+        <p>
+        The project consists of a diverse group of volunteers who share 
+        common values regarding collaborative, community-based open source 
+        development. 
+        </p>
+        
 
             <a name="statistics"/>
             <subsection name="List Subscribers and Downloads">
@@ -38,13 +45,20 @@
 
                 <p>According to recently released
                     <a href="http://www.apache.org/~vgritsenko/stats/projects/struts">
-                        statistics</a>
-                    , Struts downloads range around 15,000 a month.
+                        statistics,</a>
+                    Struts downloads range around 15,000 a month.
                 </p>
             </subsection>
 
             <a name="pmc"/>
             <subsection name="Project Management Committee Members">
+            
+                <p>
+                Committee members are listed in the chronological order, 
+                according to the date each person become a committer 
+                or committee member.
+                </p>
+            
                 <ul>
                     <li>
                         <strong>Craig R. McClanahan</strong>
@@ -116,10 +130,6 @@
                         (gvanmatre at apache.org)
                     </li>
                     <li>
-                        <strong>Sean Schofield</strong>
-                        (schof at apache.org)
-                    </li>
-                    <li>
                         <strong>Greg Reddin</strong>
                         (greddin at apache.org)
                     </li>
@@ -128,6 +138,12 @@
 
             <a name="committers"/>
             <subsection name="Committers">
+            
+                <p>
+                Other committers are listed in the chronological order, 
+                according to the date each person became a committer.
+                </p>
+                        
                 <ul>
 
                     <li>
@@ -183,6 +199,13 @@
 
             <a name="emeritus"/>
             <subsection name="Emeritus Committers">
+            
+            <p>
+            Emeritus committers are no longer active in the project. 
+            An emeritus committer can become active again upon request. 
+            ("Merit never expires.")
+            </p>
+            
                 <ul>
                     <li>Luis Arias</li>
 
@@ -203,12 +226,20 @@
                     <li>Steve Raeburn</li>
 
                     <li>James Turner</li>
-
+                    
+                    <li>Sean Schofield (PMC)</li>
+                    
                 </ul>
             </subsection>
 
             <a name="about"/>
-            <subsection name="More About Us">
+            <subsection name="About the Committers">
+            
+            <p>
+            Project committers are the core Apache Struts community. 
+            </p>
+            
+            
                 <h4 id="craigmcc">Craig R. McClanahan -- PMC Member</h4>
 
                 <p>
@@ -1079,7 +1110,7 @@
                     invitation to become a Struts Committer in June, 2005, and
                     was invited to join the PMC in December, 2005.</p>
 
-                <h4 id="gvanmatre">Gary VanMatre -- Committer</h4>
+                <h4 id="gvanmatre">Gary VanMatre -- PMC Member</h4>
 
                 <p>I landed an internship in college working with the big blue
                     iron where
@@ -1122,7 +1153,7 @@
                     plug-in. I was
                     invited to become a Struts Committer in July 2005.</p>
 
-                <h4 id="schof">Sean Schofield -- Committer</h4>
+                <h4 id="schof">Sean Schofield -- Emeritus PMC Member</h4>
 
                 <p>During a job interview in 2002 I was asked if I had any
                     experience with
@@ -1171,7 +1202,7 @@
                     Struts lies with the
                     Shale subproject.</p>
 
-                <h4 id="greddin">Greg Reddin -- Committer</h4>
+                <h4 id="greddin">Greg Reddin -- PMC Member</h4>
 
                 <p>In early 2000 I was working on a client-server application
                     that
@@ -1297,7 +1328,7 @@
         <section>
             <p class="right">
                 Next:
-                <a href="bylaws.html">PMC Charter</a>
+                <a href="releases.html">Release Guidelines</a>                
             </p>
         </section>
     </body>