You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by bu...@apache.org on 2013/01/19 14:18:01 UTC

svn commit: r847285 [13/13] - in /websites/staging/struts/trunk/content: ./ css/ dev/ images/ images/profiles/ img/ js/ proposals/ uml/

Added: websites/staging/struts/trunk/content/release-checklist.html
==============================================================================
--- websites/staging/struts/trunk/content/release-checklist.html (added)
+++ websites/staging/struts/trunk/content/release-checklist.html Sat Jan 19 13:17:59 2013
@@ -0,0 +1,462 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Jan 19, 2013
+ | Rendered using Apache Maven Fluido Skin 1.3.0
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20130119" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>
+        Release Checklist - Apache Struts Project</title>
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+
+      
+    <script type="text/javascript" src="./js/apache-maven-fluido-1.3.0.min.js"></script>
+
+    
+            </head>
+        <body class="topBarDisabled">
+          
+    
+    
+            
+    
+    
+    <a href="http://github.com/apache/struts2">
+      <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+        src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
+        alt="Fork me on GitHub">
+    </a>
+  
+                
+                    
+    
+        <div class="container-fluid">
+          <div id="banner">
+        <div class="pull-left">
+                                    <a href="http://www.apache.org/" id="bannerLeft">
+                                                                                        <img src="http://www.apache.org/images/asf-logo.gif"  alt="Apache Software Foundation"/>
+                </a>
+                      </div>
+        <div class="pull-right">                                <a href="../" id="bannerRight">
+                                                                                                <img src="images/struts.gif"  alt="Apache Struts"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                  <li id="publishDate">Last Published: 2013-01-19</li>
+                      
+                
+                    
+      
+                                              
+    <li class="pull-right">              <a href="../1.3.10/index.html" title="Struts 1">
+        Struts 1</a>
+  </li>
+
+        <li class="divider pull-right">|</li>
+      
+    <li class="pull-right">              <a href="../2.3.8/index.html" title="Struts 2">
+        Struts 2</a>
+  </li>
+
+        <li class="divider pull-right">|</li>
+      
+    <li class="pull-right">              <a href="http://www.apache.org/" class="externalLink" title="Apache">
+        Apache</a>
+  </li>
+
+                        </ul>
+      </div>
+
+            
+      <div class="row-fluid">
+        <div id="leftColumn" class="span3">
+          <div class="well sidebar-nav">
+                
+                    
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache Struts</li>
+                                
+      <li>
+    
+                          <a href="index.html" title="Welcome">
+          <i class="none"></i>
+        Welcome</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="downloads.html" title="Releases">
+          <i class="none"></i>
+        Releases</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="announce.html" title="Announcements">
+          <i class="none"></i>
+        Announcements</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">
+          <i class="none"></i>
+        License</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="kickstart.html" title="Kickstart FAQ">
+          <i class="none"></i>
+        Kickstart FAQ</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://people.apache.org/~vgritsenko/stats/projects/struts" class="externalLink" title="Website Stats">
+          <i class="none"></i>
+        Website Stats</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://apache.org/foundation/thanks.html" class="externalLink" title="Thanks!">
+          <i class="none"></i>
+        Thanks!</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">
+          <i class="none"></i>
+        Sponsorship</a>
+            </li>
+                              <li class="nav-header">Documentation</li>
+                                
+      <li>
+    
+                          <a href="primer.html" title="Key Technologies">
+          <i class="none"></i>
+        Key Technologies</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../2.3.8/index.html" title="Struts 2.3.8 (GA)">
+          <i class="none"></i>
+        Struts 2.3.8 (GA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../1.3.10/index.html" title="Struts 1.3.10 (GA)">
+          <i class="none"></i>
+        Struts 1.3.10 (GA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="downloads.html#PriorReleases" title="Prior Releases">
+          <i class="none"></i>
+        Prior Releases</a>
+            </li>
+                              <li class="nav-header">Support</li>
+                                
+      <li>
+    
+                          <a href="mail.html" title="User Mailing List">
+          <i class="none"></i>
+        User Mailing List</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="https://issues.apache.org/jira/browse/WW" class="externalLink" title="Issue Tracker (JIRA)">
+          <i class="none"></i>
+        Issue Tracker (JIRA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="security.html" title="Reporting Security Issues">
+          <i class="none"></i>
+        Reporting Security Issues</a>
+            </li>
+                              <li class="nav-header">Development</li>
+                                
+      <li>
+    
+                          <a href="../2.x/index.html" title="Struts 2.x Draft Docs">
+          <i class="none"></i>
+        Struts 2.x Draft Docs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../1.x/index.html" title="Struts 1.x Draft Docs">
+          <i class="none"></i>
+        Struts 1.x Draft Docs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="helping.html" title="How to Help FAQ">
+          <i class="none"></i>
+        How to Help FAQ</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/dev-mail.html" title="Development Lists">
+          <i class="none"></i>
+        Development Lists</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/builds.html" title="Source Code">
+          <i class="none"></i>
+        Source Code</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/releases.html" title="Release Guidelines">
+          <i class="none"></i>
+        Release Guidelines</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/bylaws.html" title="PMC Charter">
+          <i class="none"></i>
+        PMC Charter</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/minutes.html" title="Minutes">
+          <i class="none"></i>
+        Minutes</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/volunteers.html" title="Volunteers">
+          <i class="none"></i>
+        Volunteers</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../struts-sandbox/index.html" title="Sandbox">
+          <i class="none"></i>
+        Sandbox</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://svn.apache.org/viewvc/struts/" class="externalLink" title="Source Repository">
+          <i class="none"></i>
+        Source Repository</a>
+            </li>
+                              <li class="nav-header">See Also</li>
+                                
+      <li>
+    
+                          <a href="http://www.ApacheBookstore.com/" class="externalLink" title="Apache Bookstore">
+          <i class="none"></i>
+        Apache Bookstore</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://people.apache.org/~rubys/planet/struts/" class="externalLink" title="Our Blogs">
+          <i class="none"></i>
+        Our Blogs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://struts.SourceForge.net/" class="externalLink" title="Struts SourceForge">
+          <i class="none"></i>
+        Struts SourceForge</a>
+            </li>
+            </ul>
+                
+                    
+                
+          <hr class="divider" />
+
+           <div id="poweredBy">
+                            <div class="clear"></div>
+                            <div class="clear"></div>
+                            <div class="clear"></div>
+                             <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                  </div>
+          </div>
+        </div>
+        
+                
+        <div id="bodyColumn"  class="span9" >
+                                  
+            
+    <!-- // ======================================================================== 78 -->
+    
+        <div><pre>
+            = Struts x.x.x Release =
+
+            == Info ==
+
+            1. Struts [http://struts.apache.org/releases.html#Releases
+            Release Guidelines]
+
+            2. [http://wiki.apache.org/incubator/SigningReleases
+            Signing Releases]
+
+            3. Apache [http://apache.org/dev/mirrors.html Mirroring
+            Guidelines]
+
+            == Release Manager ==
+
+            The release manager is '''${RELEASE_MANAGER}'''
+
+            == Special Issues ==
+
+            1. ${ISSUES}
+
+            == Outstanding Bug Review ==
+
+            || '''ID''' || '''Summary''' || '''Component''' || '''Status''' ||
+            || ${ID} || ${SUMMARY} || $COMPONENT} || ${STATUS} ||
+
+            == Preparation Checklist ==
+
+            || '''#''' || '''Description''' || '''Status''' ||
+            || 1. || ${DESCRIPTION} || ${STATUS} ||
+
+            The Commons
+            [http://commons.apache.org/releases/prepare.html
+            Preparation Guide] is a helpful preparation backgrounder, but
+            Commons
+            uses the &quot;beta/release-candidate/final&quot; process.
+
+            Likewise, the [http://httpd.apache.org/dev/release.html
+            HTTPD Release Guidelines] is a helpful &quot;overall process&quot;
+            backgrounder,
+            but HTTPD does not use a test-build stage.
+
+            Dependency versions for this release:
+
+            || '''Dependency''' || '''Version''' || '''Status''' ||
+            || ${DEPENDENCY} || ${VERSION} || ${STATUS} ||
+
+            == Testing Checklist ==
+
+            === Testing Summary ===
+
+            || '''#''' || '''Description''' || '''Completed''' ||
+            || 1. || Run Unit Test targets || ${STATUS} ||
+            || 2. || Run Cactus Tests (see below) || ${STATUS} ||
+            || 3. || Play test bundled applications (TC 4.x) || ${STATUS} ||
+
+            TODO: A Canoo WebTest for the applications would be great!
+
+            === Cactus Tests ===
+
+            || '''#''' || '''J2SE Version''' || '''Tomcat Version''' ||
+            '''Status''' ||
+            || 1. || J2SE 1.3.x || Tomcat 4.x || ${STATUS} ||
+            || 2. || J2SE 1.4.x || Tomcat 4.x || ${STATUS} ||
+            || 3. || J2SE 1.3.x || Tomcat 5.x || ${STATUS} ||
+            || 4. || J2SE 1.4.x || Tomcat 5.x || ${STATUS} ||
+
+            == Test Build Checklist (A) ==
+
+            See also Commons
+            [http://commons.apache.org/releases/release.html
+            Step-by-Step Guide]
+
+            || '''#''' || '''Description''' || '''Completed''' ||
+            || A1. || Tag release in cvs: ${STRUTS_x_x_x} || ${STATUS} ||
+            || A2. || Run Distribution Target || ${STATUS} ||
+            || A3. || Upload Distribution to
+            cvs.apache.org:/www/svn.apache.org/dist/struts/x.x.x || ${STATUS}
+            ||
+            || A4. || Post release-quality vote on dev@ and user@ lists || ${STATUS ||
+
+      == Vote (A) ==
+
+      || ${PMC_MEMBER} || ${GRADE} ||
+
+            If release vote fails, including for a lack of quorum, remove from
+            dist
+            folder.
+
+            == Point Release Checklist (B) ==
+
+            || B1. || Create Sums and Sign Distributions [2] || ${STATUS} ||
+            || B2. || Request new Bugzilla version level (x.x.x) || ${STATUS}
+            ||
+            || B3. || Update &quot;Acquiring&quot; page on website and Test Downloads ||
+            ${STATUS} ||
+
+            == Vote (B) ==
+
+            || ${PMC_MEMBER} || ${GRADE} ||
+
+            Voting continues until a GA or &quot;withdraw&quot; vote passes, or there is
+            a
+            subsequent release.
+
+            == General Availability Checklist (C) ==
+
+            || '''#''' || '''Description''' || '''Completed''' ||
+            || C1. || Copy Distribution to Mirrored Directories [3] ||
+            ${STATUS} ||
+            || C2. || Deploy JAR to Apache Java-Repository || ${STATUS} ||
+            || C3. || After 24 hours, update &quot;Acquiring&quot; page on website ||
+            ${STATUS} ||
+            || C4. || Post an announcement to lists and website || ${STATUS}
+            ||
+            ----
+        </pre></div>
+    
+
+                  </div>
+            </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container-fluid">
+              <div class="row span12">Copyright &copy;                    2000-2013
+                        <a href="http://www.apache.org/">The Apache Software Foundation</a>.
+            All Rights Reserved.      
+                    
+      </div>
+
+                                                                  <?xml version="1.0" encoding="UTF-8"?>
+<div class="row span12">Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
+                project logos are trademarks of The Apache Software Foundation.</div>
+                  
+        
+                </div>
+    </footer>
+  </body>
+</html>

Added: websites/staging/struts/trunk/content/roadmap.html
==============================================================================
--- websites/staging/struts/trunk/content/roadmap.html (added)
+++ websites/staging/struts/trunk/content/roadmap.html Sat Jan 19 13:17:59 2013
@@ -0,0 +1,673 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Jan 19, 2013
+ | Rendered using Apache Maven Fluido Skin 1.3.0
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20130119" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>Roadmap FAQ</title>
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+
+      
+    <script type="text/javascript" src="./js/apache-maven-fluido-1.3.0.min.js"></script>
+
+    
+            </head>
+        <body class="topBarDisabled">
+          
+    
+    
+            
+    
+    
+    <a href="http://github.com/apache/struts2">
+      <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+        src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
+        alt="Fork me on GitHub">
+    </a>
+  
+                
+                    
+    
+        <div class="container-fluid">
+          <div id="banner">
+        <div class="pull-left">
+                                    <a href="http://www.apache.org/" id="bannerLeft">
+                                                                                        <img src="http://www.apache.org/images/asf-logo.gif"  alt="Apache Software Foundation"/>
+                </a>
+                      </div>
+        <div class="pull-right">                                <a href="../" id="bannerRight">
+                                                                                                <img src="images/struts.gif"  alt="Apache Struts"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                  <li id="publishDate">Last Published: 2013-01-19</li>
+                      
+                
+                    
+      
+                                              
+    <li class="pull-right">              <a href="../1.3.10/index.html" title="Struts 1">
+        Struts 1</a>
+  </li>
+
+        <li class="divider pull-right">|</li>
+      
+    <li class="pull-right">              <a href="../2.3.8/index.html" title="Struts 2">
+        Struts 2</a>
+  </li>
+
+        <li class="divider pull-right">|</li>
+      
+    <li class="pull-right">              <a href="http://www.apache.org/" class="externalLink" title="Apache">
+        Apache</a>
+  </li>
+
+                        </ul>
+      </div>
+
+            
+      <div class="row-fluid">
+        <div id="leftColumn" class="span3">
+          <div class="well sidebar-nav">
+                
+                    
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache Struts</li>
+                                
+      <li>
+    
+                          <a href="index.html" title="Welcome">
+          <i class="none"></i>
+        Welcome</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="downloads.html" title="Releases">
+          <i class="none"></i>
+        Releases</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="announce.html" title="Announcements">
+          <i class="none"></i>
+        Announcements</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">
+          <i class="none"></i>
+        License</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="kickstart.html" title="Kickstart FAQ">
+          <i class="none"></i>
+        Kickstart FAQ</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://people.apache.org/~vgritsenko/stats/projects/struts" class="externalLink" title="Website Stats">
+          <i class="none"></i>
+        Website Stats</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://apache.org/foundation/thanks.html" class="externalLink" title="Thanks!">
+          <i class="none"></i>
+        Thanks!</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">
+          <i class="none"></i>
+        Sponsorship</a>
+            </li>
+                              <li class="nav-header">Documentation</li>
+                                
+      <li>
+    
+                          <a href="primer.html" title="Key Technologies">
+          <i class="none"></i>
+        Key Technologies</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../2.3.8/index.html" title="Struts 2.3.8 (GA)">
+          <i class="none"></i>
+        Struts 2.3.8 (GA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../1.3.10/index.html" title="Struts 1.3.10 (GA)">
+          <i class="none"></i>
+        Struts 1.3.10 (GA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="downloads.html#PriorReleases" title="Prior Releases">
+          <i class="none"></i>
+        Prior Releases</a>
+            </li>
+                              <li class="nav-header">Support</li>
+                                
+      <li>
+    
+                          <a href="mail.html" title="User Mailing List">
+          <i class="none"></i>
+        User Mailing List</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="https://issues.apache.org/jira/browse/WW" class="externalLink" title="Issue Tracker (JIRA)">
+          <i class="none"></i>
+        Issue Tracker (JIRA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="security.html" title="Reporting Security Issues">
+          <i class="none"></i>
+        Reporting Security Issues</a>
+            </li>
+                              <li class="nav-header">Development</li>
+                                
+      <li>
+    
+                          <a href="../2.x/index.html" title="Struts 2.x Draft Docs">
+          <i class="none"></i>
+        Struts 2.x Draft Docs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../1.x/index.html" title="Struts 1.x Draft Docs">
+          <i class="none"></i>
+        Struts 1.x Draft Docs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="helping.html" title="How to Help FAQ">
+          <i class="none"></i>
+        How to Help FAQ</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/dev-mail.html" title="Development Lists">
+          <i class="none"></i>
+        Development Lists</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/builds.html" title="Source Code">
+          <i class="none"></i>
+        Source Code</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/releases.html" title="Release Guidelines">
+          <i class="none"></i>
+        Release Guidelines</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/bylaws.html" title="PMC Charter">
+          <i class="none"></i>
+        PMC Charter</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/minutes.html" title="Minutes">
+          <i class="none"></i>
+        Minutes</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/volunteers.html" title="Volunteers">
+          <i class="none"></i>
+        Volunteers</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../struts-sandbox/index.html" title="Sandbox">
+          <i class="none"></i>
+        Sandbox</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://svn.apache.org/viewvc/struts/" class="externalLink" title="Source Repository">
+          <i class="none"></i>
+        Source Repository</a>
+            </li>
+                              <li class="nav-header">See Also</li>
+                                
+      <li>
+    
+                          <a href="http://www.ApacheBookstore.com/" class="externalLink" title="Apache Bookstore">
+          <i class="none"></i>
+        Apache Bookstore</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://people.apache.org/~rubys/planet/struts/" class="externalLink" title="Our Blogs">
+          <i class="none"></i>
+        Our Blogs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://struts.SourceForge.net/" class="externalLink" title="Struts SourceForge">
+          <i class="none"></i>
+        Struts SourceForge</a>
+            </li>
+            </ul>
+                
+                    
+                
+          <hr class="divider" />
+
+           <div id="poweredBy">
+                            <div class="clear"></div>
+                            <div class="clear"></div>
+                            <div class="clear"></div>
+                             <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                  </div>
+          </div>
+        </div>
+        
+                
+        <div id="bodyColumn"  class="span9" >
+                                  
+            <!-- Copyright 1999-2005 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. --><!-- // ======================================================================== 78 --><!-- <part>
+        <p class="right">
+            <strong>Next:</strong>
+            <a href="helping.html">How to Help FAQ</a>
+        </p>
+    </part> --><div class="section"><h2><a name="top">Roadmap FAQ</a><a name="Roadmap_FAQ"></a></h2><ol style="list-style-type: decimal"><li><a href="#ti">What about Ti? What about WebWork?</a></li><li><a href="#roots">If they share the same roots,
+            why did WebWork evolve more quickly than Struts 1?</a></li><li><a href="#xwork">What about other Open Symphony products, like
+                XWork?</a></li><li><a href="#new">What's changed in Struts 2?</a></li><li><a href="#stable">Is Struts 2 stable?</a></li><li><a href="#now">If I'm starting a new project right now, 
+            should I use Struts 2 or WebWork 2?</a></li><li><a href="#migrate_ww">Is it difficult to migrate from WebWork 2 to
+                Struts 2?</a></li><li><a href="#obsolete">Is Struts 1 obsolete?</a></li><li><a href="#migrate_s1">Is it difficult to migrate from Struts 1 to
+                Struts 2?</a></li><li><a href="#migrate_reasons">What circumstances justify a migration?</a></li><li><a href="#jsf">Wouldn't it be just as easy to migrate to JavaServer Faces?</a></li><li><a href="#classic">Is Struts Classic another name for Struts 1?
+            </a></li></ol></div><dl><dt><a name="ti">What about Ti? What about WebWork?</a></dt><dd>
+                <p>
+                    <a class="externalLink" href="http://wiki.apache.org/struts/StrutsTi">Struts
+                        Ti</a>
+                    (short for Titanium) was a codename for Struts 2.
+                    In late November 2005, the Ti proposal was amended to
+                    include a merger with
+                    <a class="externalLink" href="http://www.opensymphony.com/webwork/">Open
+                        Symphony WebWork.</a>
+                    Pursuant to this plan, WebWork 2.2 was
+                    donated to the ASF in March 2006,
+                    and the active WebWork committers joined the Apache Struts Project.
+                    The WebWork codebase was brought into the ASF through
+                    the
+                    <a class="externalLink" href="http://incubator.apache.org/projects/webwork2.html">
+                        Apache Incubator.</a>
+                    The donated codebase is now part of the Apache Struts 
+                    Project.
+               </p>
+                <p>
+                    WebWork started as a
+                    <a class="externalLink" href="http://incubator.apache.org/learn/rules-for-revolutionaries.html">
+                        Struts Revolution.</a>
+                    Over the years, it has evolved into a superb action-based
+                    framework that retains many Struts 1 paradigms.
+               </p>
+                <p>
+                    People who have worked with both Struts 1 and WebWork
+                    2 tend to agree that it was the logical candidate for
+                    Struts 2.
+                    If you had looked at the Struts 1 roadmap and the WebWork
+                    2 feature set,
+                    you'd see that WebWork has already did most of what we
+                    had wanted the Struts framework to do.
+                    If we had finished the original Struts 1 roadmap as written, 
+                    Struts 1 would have ended up being a WebWork 2 workalike.
+                    Rather than reinvent the wheel,
+                    Ti became a proposal to put the WebWork wheel back on
+                    the Struts axle.
+               </p>
+                <p>
+                    At this point, the Ti codename has been dropped,
+                    and we are referring to the donated codebase as Struts 2.
+               </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="roots">If they share the same roots,
+            why did WebWork evolve more quickly than Struts 1?</a></dt><dd>
+                <p>
+                    The Struts 1.x release series is deeply into &quot;backward 
+                    compatibility&quot; mode. In fact, 
+                    backward compatibility has become an obsession with Struts 1.
+                    Before making any API change, we deprecate the existing member,
+                    and make at least one milestone release before removing the 
+                    deprecated member.
+                    Each Struts milestone is drop-and-go compatible with the last.
+                    Maintaining this degree of stability takes a lot of effort,
+                    but given the installed base, we feel it is worth the time and 
+                    trouble.
+               </p>
+                <p>
+                  There were several proposals for a new Struts 2 codebase.
+                  The first formal proposal was
+                  <a class="externalLink" href="http://wiki.apache.org/struts/StrutsJericho">Jericho,</a>
+                  followed by
+                  <a class="externalLink" href="http://wiki.apache.org/struts/StrutsShale">Shale,</a>
+                  and then
+                  <a class="externalLink" href="http://wiki.apache.org/struts/StrutsTi">Ti.</a>
+                  Jericho never progressed past the trial balloon stage.
+                  Shale is based on JavaServer Faces, and, when the time came,
+                  the Apache Struts PMC found that many of us were not ready to
+                  adopt JSF just yet.
+                  Initially, Shale was a Struts subproject,
+                  but later Shale graduated to its own 
+                  <a class="externalLink" href="http://struts.apache.org/struts-shale">top-level ASF 
+                  project.</a>
+              </p>
+               <p>
+                   The Ti proposal includes the idea of collaborating with other
+                   projects to build a &quot;best of breed&quot; framework that incorporates
+                   everything we have learned over the past six years.
+                   The original Ti proposal included technology developed by
+                   <a class="externalLink" href="http://beehive.apache.org/">Apache BeeHive,</a>
+                   <a class="externalLink" href="http://www.springframework.org/">Spring,</a> and
+                   <a class="externalLink" href="http://www.opensymphony.com/webwork/">OpenSympony WebWork.</a>
+                   In the course of co-developing the initial Ti codebase,
+                   the WebWork team offered to &quot;join forces&quot; with
+                   the Apache Struts group,
+                   so that we could work more closely together.
+                   Out of these collaborations,
+                   the <a class="externalLink" href="http://struts.apache.org/announce.html#a20051214.3">
+                   Apache Struts/OpenSymphony WebWork</a> merger arose.
+              </p>
+               <p>
+                    For additional background, see 
+                    <a class="externalLink" href="http://www.oreillynet.com/onjava/blog/2006/10/my_history_of_struts_2.html">My History of Struts 2</a>.
+              </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="xwork">What about other Open Symphony products, like
+                XWork?</a></dt><dd>
+
+                <p>
+                    For the time being, there is no plan to migrate XWork to
+                    to the ASF. 
+                    Struts has always had many dependencies on external 
+                    packages. 
+                    So long as projects like XWork and SiteMesh are doing  
+                    well at OpenSymphony, there is no reason to change venues.
+                    Of course, if another OpenSymphony project were ready to 
+                    join the ASF, our door is open.
+               </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="new">What's changed in Struts 2?</a></dt><dd>
+               <p>
+                  Struts 2 is designed to be simpler to use and closer to how 
+                  Struts was always meant to be. 
+                  To Struts 1 developers, 
+                  Struts 2 feels strange but familiar. 
+                  For more, visit the 
+                  <a class="externalLink" href="http://struts.apache.org/2.x/">Struts 2 homepage</a>.
+              </p>
+
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="stable">Is Struts 2 stable?</a></dt><dd>
+                <p>
+                  Struts 2 is stable, featureful, and ready for primetime. 
+                  It's the direct descendant of  WebWork 2, 
+                  and we have dubbed the 2.0.x series the 
+                  &quot;compatiblity release&quot;. The bits themselves are ready-to-go. 
+                  We're just finishing-up on peripheral concerns that don't 
+                  affect the code itself, and new, optional features that 
+                  don't affect the existing feature set.
+               </p>
+                <p>
+                  In Struts 2.0.x, we won't be straying far from the path 
+                  WebWork 2 has already blazed. WW2 powers some of the 
+                  greatest web applications on the planet, including 
+                  Confluence and Jive Forums. 
+                  There's no arguing with success!
+               </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="now">If I'm starting a new project right now, 
+            should I use Struts 2 or WebWork 2?</a></dt><dd>
+                <p>
+                    A &quot;General Availability&quot; release of Struts 2 is 
+                    now available. 
+                    It is very compatible with WebWork 2, 
+                    but offers several new features. 
+                    WebWork 2 is still available, although it is uncertain 
+                    whether there will be many new releases of WebWork.
+               </p>
+                <p>
+                    Of course, WebWork 2 is going to be supported for some time to come, 
+                    just as Struts 1 will be supported. 
+                    Both products have a robust user community, 
+                    and many of us have mature projects in production 
+                    that will never be migrated to a new major release. 
+               </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="migrate_ww">Is it difficult to migrate from WebWork 2 to
+                Struts 2?</a></dt><dd>
+                <p>
+                    No. 
+               </p>
+                <p>
+                    Essentially, Struts 2.0 is the technical 
+                    equivalent of WebWork 2.3.
+                    Aside from the package and property renaming, 
+                    it isn't much different than, say, migrating 
+                    from WebWork 2.1 to 2.2. 
+               </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="obsolete">Is Struts 1 obsolete?</a></dt><dd>
+                <p>
+                    No.
+               </p>
+                <p>
+                    There is a robust and vibrant community of developers using 
+                    Struts 1 in production, and we expect that thousands of teams 
+                    will continue to base new projects on Struts 1, and continue 
+                    to support existing projects, for many, many years to come. 
+               </p>
+                <p>
+                    New and improved extensions for Struts 1 continue to appear 
+                    regularly. 
+                    In <b>2006 alone</b>, we saw releases of 
+
+                    <a class="externalLink" href="http://www.sundog.net/index.php/hoople/page/struts/">Hoople,</a>
+                    <a class="externalLink" href="http://strecks.sourceforge.net/">Strecks,</a>
+                    <a class="externalLink" href="http://www.jspcontrols.net">JSP Control Tags,</a>
+                    <a class="externalLink" href="http://mojodna.net/sprout/">Sprout,</a>
+                    <a class="externalLink" href="http://www.springframework.org/node/239">Spring Web Flow,</a>
+                    <a class="externalLink" href="http://getahead.ltd.uk/dwr/">DWR,</a>
+                    <a class="externalLink" href="http://calyxo.org/">Calyxo,</a>
+                    <a class="externalLink" href="https://formdef.dev.java.net/">FormDef,</a> and
+                    <a class="externalLink" href="http://javawebparts.sourceforge.net/">Java Web Parts</a>.              
+
+                    There are 
+                    <a class="externalLink" href="http://opensource.atlassian.com/confluence/oss/display/BOOKS/Books+about+Struts">
+                    dozens of books</a> and 
+                    <a class="externalLink" href="http://www.StrutsCentral.net/Resources/Struts1/articles-2006.html">
+                    hundreds of articles</a> available to help people get started with 
+                    Struts 1 or improve the application they already have.
+               </p>
+                <p>
+                    Since the merger, Struts 1 has gone on to release a new minor 
+                    version, Struts 1.3, 
+                    and new 1.x releases are being planned.
+                    Struts 1 continues to be the most popular and best supported 
+                    web application framework for Java.
+               </p>
+
+                <p>
+                   Of course, if you are starting a new project, and have your 
+                   choice of frameworks, 
+                   this might be a good time to consider whether you would like to 
+                   continue to use Struts 1 or
+                   whether it's time to try Struts 2. 
+               </p>            
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="migrate_s1">Is it difficult to migrate from Struts 1 to
+                Struts 2?</a></dt><dd>
+                <p>
+                    We do not recommend migrating stable Struts 1 
+                    applications to Struts 2, unless significant new 
+                    development is planned. 
+                    Struts 1 will be supported for some time to come, 
+                    and there is no reason to rework code that already works. 
+               </p>
+                <p>
+                    If new features are being added to an existing 
+                    application, the Struts 1 and Struts 2 codebases 
+                    can coexist in the same application. 
+                    Struts 1 actions can handle the *.dos and 
+                    Struts 2 can handle the *.actions.
+                    Once a team is committed to Struts 2, 
+                    one way to stage a migration would be to migrate 
+                    one action at a time 
+                    (until there's nothing left to do).
+               </p>
+                <p>
+                    For help with migrations, see the 
+                    <a class="externalLink" href="http://struts.apache.org/2.x/docs/migration-guide.html">
+                    Struts 2 Migration Guide.</a>
+               </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="migrate_reasons">What circumstances justify a migration?</a></dt><dd>
+                <p>
+                 Five reasons to migrate:
+                </p>
+                 <ol style="list-style-type: decimal">
+                    <li>
+                       Your S1 application is ready for its own version 2.
+                   </li>
+                    <li>
+                        Your S1 application is still under development 
+                        or in the planning stages.
+                   </li>
+                    <li>
+                        You inherited a S1 application that needs work, 
+                        and you don't understand how it works.
+                   </li>
+                    <li>
+                        You would like to integrate a few JSF components 
+                        into your application.
+                   </li>
+                    <li>
+                        The charming quirks of S1 have become downright 
+                        annoyances, 
+                        and your team is ready for an elegant yet familiar 
+                        solution.
+                   </li>
+                   </ol>
+
+                    <p>
+                    Five reasons <b>not</b> to migrate:
+                   </p>
+                 <ol style="list-style-type: decimal">
+                    <li>
+                        Your S1 application that is stable and 
+                        simply being maintained (stay the course).
+                   </li>
+                    <li>                    
+                        You're afraid S1 won't be maintained 
+                        (won't happen).
+                   </li>
+                    <li>                    
+                        You want to move to Ajax (try Java WebParts).
+                   </li>
+                    <li>                    
+                        You want to move to Java 5 (try Strecks).
+                   </li>
+                    <li>
+                        It's a shiny new toy (find a new project).                
+                   </li>
+                </ol>                
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="jsf">Wouldn't it be just as easy to migrate to JavaServer Faces?</a></dt><dd>
+                <p>
+                    <a class="externalLink" href="http://struts.apache.org/2.x/docs/javaserver-faces.html">
+                    Struts 2 supports JSF components,</a> 
+                    so it's not an either/or proposition.
+                    For a complete JSF solution designed with 
+                    Struts developers in mind, 
+                    see <a class="externalLink" href="http://shale.apache.org/">Apache Shale.</a>
+               </p>
+                <p>
+                    The overall direction of Struts 2 is to continue to become the 
+                    framework that we actually <i>want</i> to use to build our own 
+                    applications. Sometimes that means supporting J2EE technologies, 
+                    like JavaServer Faces. Sometimes that means 
+                    <a class="externalLink" href="http://struts.apache.org/2.x/docs/architecture.html">
+                    creating our own technologies,</a> 
+                    like Interceptors, the Value Stack, and Taglib Themes.
+               </p>
+            <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="classic">Is Struts Classic another name for Struts 1?
+            </a></dt><dd>
+                <p>
+                    Struts Classic is a codename for the work we needed to do to
+                    create and release the seven components we extracted from
+                    Struts 1.2. It is not a product per-se, but shorthand for the
+                    1.3.0 build of the seven components. 
+                </p>
+            <p align="right"><a href="#top">[top]</a></p></dd></dl>
+                  </div>
+            </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container-fluid">
+              <div class="row span12">Copyright &copy;                    2000-2013
+                        <a href="http://www.apache.org/">The Apache Software Foundation</a>.
+            All Rights Reserved.      
+                    
+      </div>
+
+                                                                  <?xml version="1.0" encoding="UTF-8"?>
+<div class="row span12">Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
+                project logos are trademarks of The Apache Software Foundation.</div>
+                  
+        
+                </div>
+    </footer>
+  </body>
+</html>

Added: websites/staging/struts/trunk/content/robots.txt
==============================================================================
--- websites/staging/struts/trunk/content/robots.txt (added)
+++ websites/staging/struts/trunk/content/robots.txt Sat Jan 19 13:17:59 2013
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /2.x

Added: websites/staging/struts/trunk/content/security.html
==============================================================================
--- websites/staging/struts/trunk/content/security.html (added)
+++ websites/staging/struts/trunk/content/security.html Sat Jan 19 13:17:59 2013
@@ -0,0 +1,403 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Jan 19, 2013
+ | Rendered using Apache Maven Fluido Skin 1.3.0
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta name="Date-Revision-yyyymmdd" content="20130119" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title>
+        Security Issues</title>
+    <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
+    <link rel="stylesheet" href="./css/site.css" />
+    <link rel="stylesheet" href="./css/print.css" media="print" />
+
+      
+    <script type="text/javascript" src="./js/apache-maven-fluido-1.3.0.min.js"></script>
+
+    
+            </head>
+        <body class="topBarDisabled">
+          
+    
+    
+            
+    
+    
+    <a href="http://github.com/apache/struts2">
+      <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
+        src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
+        alt="Fork me on GitHub">
+    </a>
+  
+                
+                    
+    
+        <div class="container-fluid">
+          <div id="banner">
+        <div class="pull-left">
+                                    <a href="http://www.apache.org/" id="bannerLeft">
+                                                                                        <img src="http://www.apache.org/images/asf-logo.gif"  alt="Apache Software Foundation"/>
+                </a>
+                      </div>
+        <div class="pull-right">                                <a href="../" id="bannerRight">
+                                                                                                <img src="images/struts.gif"  alt="Apache Struts"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                  <li id="publishDate">Last Published: 2013-01-19</li>
+                      
+                
+                    
+      
+                                              
+    <li class="pull-right">              <a href="../1.3.10/index.html" title="Struts 1">
+        Struts 1</a>
+  </li>
+
+        <li class="divider pull-right">|</li>
+      
+    <li class="pull-right">              <a href="../2.3.8/index.html" title="Struts 2">
+        Struts 2</a>
+  </li>
+
+        <li class="divider pull-right">|</li>
+      
+    <li class="pull-right">              <a href="http://www.apache.org/" class="externalLink" title="Apache">
+        Apache</a>
+  </li>
+
+                        </ul>
+      </div>
+
+            
+      <div class="row-fluid">
+        <div id="leftColumn" class="span3">
+          <div class="well sidebar-nav">
+                
+                    
+                <ul class="nav nav-list">
+                    <li class="nav-header">Apache Struts</li>
+                                
+      <li>
+    
+                          <a href="index.html" title="Welcome">
+          <i class="none"></i>
+        Welcome</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="downloads.html" title="Releases">
+          <i class="none"></i>
+        Releases</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="announce.html" title="Announcements">
+          <i class="none"></i>
+        Announcements</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://www.apache.org/licenses/" class="externalLink" title="License">
+          <i class="none"></i>
+        License</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="kickstart.html" title="Kickstart FAQ">
+          <i class="none"></i>
+        Kickstart FAQ</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://people.apache.org/~vgritsenko/stats/projects/struts" class="externalLink" title="Website Stats">
+          <i class="none"></i>
+        Website Stats</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://apache.org/foundation/thanks.html" class="externalLink" title="Thanks!">
+          <i class="none"></i>
+        Thanks!</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://apache.org/foundation/sponsorship.html" class="externalLink" title="Sponsorship">
+          <i class="none"></i>
+        Sponsorship</a>
+            </li>
+                              <li class="nav-header">Documentation</li>
+                                
+      <li>
+    
+                          <a href="primer.html" title="Key Technologies">
+          <i class="none"></i>
+        Key Technologies</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../2.3.8/index.html" title="Struts 2.3.8 (GA)">
+          <i class="none"></i>
+        Struts 2.3.8 (GA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../1.3.10/index.html" title="Struts 1.3.10 (GA)">
+          <i class="none"></i>
+        Struts 1.3.10 (GA)</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="downloads.html#PriorReleases" title="Prior Releases">
+          <i class="none"></i>
+        Prior Releases</a>
+            </li>
+                              <li class="nav-header">Support</li>
+                                
+      <li>
+    
+                          <a href="mail.html" title="User Mailing List">
+          <i class="none"></i>
+        User Mailing List</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="https://issues.apache.org/jira/browse/WW" class="externalLink" title="Issue Tracker (JIRA)">
+          <i class="none"></i>
+        Issue Tracker (JIRA)</a>
+            </li>
+                  
+      <li class="active">
+    
+            <a href="#"><i class="none"></i>Reporting Security Issues</a>
+          </li>
+                              <li class="nav-header">Development</li>
+                                
+      <li>
+    
+                          <a href="../2.x/index.html" title="Struts 2.x Draft Docs">
+          <i class="none"></i>
+        Struts 2.x Draft Docs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../1.x/index.html" title="Struts 1.x Draft Docs">
+          <i class="none"></i>
+        Struts 1.x Draft Docs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="helping.html" title="How to Help FAQ">
+          <i class="none"></i>
+        How to Help FAQ</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/dev-mail.html" title="Development Lists">
+          <i class="none"></i>
+        Development Lists</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/builds.html" title="Source Code">
+          <i class="none"></i>
+        Source Code</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/releases.html" title="Release Guidelines">
+          <i class="none"></i>
+        Release Guidelines</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/bylaws.html" title="PMC Charter">
+          <i class="none"></i>
+        PMC Charter</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/minutes.html" title="Minutes">
+          <i class="none"></i>
+        Minutes</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="dev/volunteers.html" title="Volunteers">
+          <i class="none"></i>
+        Volunteers</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="../struts-sandbox/index.html" title="Sandbox">
+          <i class="none"></i>
+        Sandbox</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://svn.apache.org/viewvc/struts/" class="externalLink" title="Source Repository">
+          <i class="none"></i>
+        Source Repository</a>
+            </li>
+                              <li class="nav-header">See Also</li>
+                                
+      <li>
+    
+                          <a href="http://www.ApacheBookstore.com/" class="externalLink" title="Apache Bookstore">
+          <i class="none"></i>
+        Apache Bookstore</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://people.apache.org/~rubys/planet/struts/" class="externalLink" title="Our Blogs">
+          <i class="none"></i>
+        Our Blogs</a>
+            </li>
+                  
+      <li>
+    
+                          <a href="http://struts.SourceForge.net/" class="externalLink" title="Struts SourceForge">
+          <i class="none"></i>
+        Struts SourceForge</a>
+            </li>
+            </ul>
+                
+                    
+                
+          <hr class="divider" />
+
+           <div id="poweredBy">
+                            <div class="clear"></div>
+                            <div class="clear"></div>
+                            <div class="clear"></div>
+                             <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                  </div>
+          </div>
+        </div>
+        
+                
+        <div id="bodyColumn"  class="span9" >
+                                  
+            <!-- Copyright 1999-2005 The Apache Software Foundation
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License. --><!-- // ======================================================================== 78 -->
+
+    
+
+        <div class="section"><h2>Reporting New Security Issues with Apache Struts<a name="Reporting_New_Security_Issues_with_Apache_Struts"></a></h2>
+
+            <p>
+              The Apache Struts project takes a very active stance in
+              eliminating security problems and denial of service attacks
+              against applications using the Apache Struts framework.
+            </p>
+
+            <p><b>
+              We strongly encourage folks to report such security problems to our
+              private security mailing list first, before disclosing them
+              in a public forum.</b>
+            </p>
+
+            <p>
+              We cannot accept regular bug reports or other queries at
+              this address, we ask that you use our
+              <a class="externalLink" href="http://issues.apache.org/jira/">issue tracker (JIRA)</a>
+              for those. <span style="color:red;">All mail sent to this
+              address that does not relate to security problems in the Apache
+              Struts source code will be ignored.</span>
+            </p>
+
+            <p>
+              Note that all networked servers are subject to denial of service
+              attacks, and we cannot promise magic workarounds to generic problems
+              (such as a client streaming lots of data to your server, or re-requesting
+              the same URL repeatedly). In general our philosophy is to avoid any
+              attacks which can cause the server to consume resources in a non-linear
+              relationship to the size of inputs.
+            </p>
+
+            <p>
+              The mailing address is:
+              <tt>security at struts (dot) apache (dot) org</tt>
+            </p>
+
+            <p>
+              <a class="externalLink" href="http://httpd.apache.org/docs/trunk/misc/security_tips.html">
+              General network server security tips</a>
+            </p>
+
+            <p>
+              <a class="externalLink" href="http://www.apache.org/security/">
+              The Apache Security Team</a>
+            </p>
+
+        </div>
+
+    
+
+                  </div>
+            </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container-fluid">
+              <div class="row span12">Copyright &copy;                    2000-2013
+                        <a href="http://www.apache.org/">The Apache Software Foundation</a>.
+            All Rights Reserved.      
+                    
+      </div>
+
+                                                                  <?xml version="1.0" encoding="UTF-8"?>
+<div class="row span12">Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
+                project logos are trademarks of The Apache Software Foundation.</div>
+                  
+        
+                </div>
+    </footer>
+  </body>
+</html>

Added: websites/staging/struts/trunk/content/uml/Credits.html
==============================================================================
--- websites/staging/struts/trunk/content/uml/Credits.html (added)
+++ websites/staging/struts/trunk/content/uml/Credits.html Sat Jan 19 13:17:59 2013
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Credits</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+</head>
+
+<body>
+<ul>
+<li>sequence-diagram-action.gif Submitted sequence diagram by Gerry Chike on Feb 01.
+    Based on article by David Geary in the Nov 2000 JavaReport article</li>
+</ul>
+
+
+</body>
+</html>

Added: websites/staging/struts/trunk/content/uml/StrutsWork.jdm
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/struts/trunk/content/uml/StrutsWork.jdm
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: websites/staging/struts/trunk/content/uml/sequence-diagram-action.gif
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/struts/trunk/content/uml/sequence-diagram-action.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif