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 2014/01/22 10:37:44 UTC

svn commit: r895071 [1/2] - in /websites/staging/struts/trunk/content: ./ dev/

Author: buildbot
Date: Wed Jan 22 09:37:43 2014
New Revision: 895071

Log:
Staging update by buildbot for struts

Added:
    websites/staging/struts/trunk/content/builds.html
    websites/staging/struts/trunk/content/bylaws.html
    websites/staging/struts/trunk/content/dev-mail.html
    websites/staging/struts/trunk/content/git-for-struts.html
    websites/staging/struts/trunk/content/releases.html
    websites/staging/struts/trunk/content/volunteers.html
Removed:
    websites/staging/struts/trunk/content/dev/
Modified:
    websites/staging/struts/trunk/content/   (props changed)
    websites/staging/struts/trunk/content/announce-2002.html
    websites/staging/struts/trunk/content/announce-2003.html
    websites/staging/struts/trunk/content/announce-2004.html
    websites/staging/struts/trunk/content/announce-2005.html
    websites/staging/struts/trunk/content/announce-2006.html
    websites/staging/struts/trunk/content/announce-2007.html
    websites/staging/struts/trunk/content/announce-2008.html
    websites/staging/struts/trunk/content/announce-2009.html
    websites/staging/struts/trunk/content/announce-2010.html
    websites/staging/struts/trunk/content/announce-2011.html
    websites/staging/struts/trunk/content/announce-2012.html
    websites/staging/struts/trunk/content/announce.html
    websites/staging/struts/trunk/content/birdseye.html
    websites/staging/struts/trunk/content/download.html
    websites/staging/struts/trunk/content/downloads.html
    websites/staging/struts/trunk/content/faqs.html
    websites/staging/struts/trunk/content/helping.html
    websites/staging/struts/trunk/content/index.html
    websites/staging/struts/trunk/content/javadoc.html
    websites/staging/struts/trunk/content/kickstart.html
    websites/staging/struts/trunk/content/mail.html
    websites/staging/struts/trunk/content/primer.html
    websites/staging/struts/trunk/content/release-checklist.html
    websites/staging/struts/trunk/content/roadmap.html
    websites/staging/struts/trunk/content/security.html
    websites/staging/struts/trunk/content/struts1eol-announcement.html
    websites/staging/struts/trunk/content/struts1eol-press.html
    websites/staging/struts/trunk/content/youatstruts.html

Propchange: websites/staging/struts/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jan 22 09:37:43 2014
@@ -1 +1 @@
-1558310
+1560296

Modified: websites/staging/struts/trunk/content/announce-2002.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2002.html (original)
+++ websites/staging/struts/trunk/content/announce-2002.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements - 2002 and prior</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2003.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2003.html (original)
+++ websites/staging/struts/trunk/content/announce-2003.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements - 2003</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2004.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2004.html (original)
+++ websites/staging/struts/trunk/content/announce-2004.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements - 2004</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2005.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2005.html (original)
+++ websites/staging/struts/trunk/content/announce-2005.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements - 2005</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2006.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2006.html (original)
+++ websites/staging/struts/trunk/content/announce-2006.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2007.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2007.html (original)
+++ websites/staging/struts/trunk/content/announce-2007.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2008.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2008.html (original)
+++ websites/staging/struts/trunk/content/announce-2008.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2009.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2009.html (original)
+++ websites/staging/struts/trunk/content/announce-2009.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2010.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2010.html (original)
+++ websites/staging/struts/trunk/content/announce-2010.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2011.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2011.html (original)
+++ websites/staging/struts/trunk/content/announce-2011.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce-2012.html
==============================================================================
--- websites/staging/struts/trunk/content/announce-2012.html (original)
+++ websites/staging/struts/trunk/content/announce-2012.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/announce.html
==============================================================================
--- websites/staging/struts/trunk/content/announce.html (original)
+++ websites/staging/struts/trunk/content/announce.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Announcements</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/birdseye.html
==============================================================================
--- websites/staging/struts/trunk/content/birdseye.html (original)
+++ websites/staging/struts/trunk/content/birdseye.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>From a birds eye</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -166,7 +166,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Added: websites/staging/struts/trunk/content/builds.html
==============================================================================
--- websites/staging/struts/trunk/content/builds.html (added)
+++ websites/staging/struts/trunk/content/builds.html Wed Jan 22 09:37:43 2014
@@ -0,0 +1,224 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Jan 22, 2014
+ | 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="20140122" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title></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="topBarEnabled">
+          
+    
+    
+            
+    
+    
+    <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 id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container"><div class="nav-collapse">
+            
+                
+                                <ul class="nav">
+                          <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache Struts <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="index.html"  title="Welcome">Welcome</a>
+</li>
+                  
+                      <li>      <a href="downloads.html"  title="Downloads">Downloads</a>
+</li>
+                  
+                      <li>      <a href="announce.html"  title="Announcements">Announcements</a>
+</li>
+                  
+                      <li>      <a href="http://www.apache.org/licenses/"  title="License">License</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/thanks.html"  title="Thanks!">Thanks!</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/sponsorship.html"  title="Sponsorship">Sponsorship</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="mail.html"  title="User Mailing List">User Mailing List</a>
+</li>
+                  
+                      <li>      <a href="https://issues.apache.org/jira/browse/WW"  title="Issue Tracker">Issue Tracker</a>
+</li>
+                  
+                      <li>      <a href="security.html"  title="Reporting Security Issues">Reporting Security Issues</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="birdseye.html"  title="Birds Eye">Birds Eye</a>
+</li>
+                  
+                      <li>      <a href="primer.html"  title="Key Technologies">Key Technologies</a>
+</li>
+                  
+                      <li>      <a href="kickstart.html"  title="Kickstart FAQ">Kickstart FAQ</a>
+</li>
+                  
+                      <li>      <a href="https://cwiki.apache.org/confluence/display/WW/Home"  title="Wiki">Wiki</a>
+</li>
+                  
+                      <li>      <a href="../release/2.3.x/index.html"  title="Struts 2">Struts 2</a>
+</li>
+                  
+                      <li>      <a href="../release/1.3.x/index.html"  title="Struts 1">Struts 1</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contributing <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="youatstruts.html"  title="You at Struts">You at Struts</a>
+</li>
+                  
+                      <li>      <a href="helping.html"  title="How to Help FAQ">How to Help FAQ</a>
+</li>
+                  
+                      <li>      <a href="dev/dev-mail.html"  title="Development Lists">Development Lists</a>
+</li>
+                  
+                      <li>      <a href="dev/git-for-struts.html"  title="Git for Struts">Git for Struts</a>
+</li>
+                  
+                      <li>      <a href="dev/troubleshooting-git-svn.html"  title="Troubleshooting Git-Svn">Troubleshooting Git-Svn</a>
+</li>
+                  
+                      <li>      <a href="dev/builds.html"  title="Source Code">Source Code</a>
+</li>
+                  
+                      <li>      <a href="dev/releases.html"  title="Release Guidelines">Release Guidelines</a>
+</li>
+                  
+                      <li>      <a href="dev/bylaws.html"  title="PMC Charter">PMC Charter</a>
+</li>
+                  
+                      <li>      <a href="dev/volunteers.html"  title="Volunteers">Volunteers</a>
+</li>
+                  
+                      <li>      <a href="http://svn.apache.org/viewvc/struts/"  title="Source Repository">Source Repository</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+          
+                                                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
+    
+        <div class="container">
+          <div id="banner">
+        <div class="pull-left">
+                                                  <a href="../" id="bannerLeft">
+                                                                                                <img src="images/struts.gif"  alt="Apache Struts"/>
+                </a>
+                      </div>
+        <div class="pull-right">                  <a href="http://www.apache.org" id="bannerRight">
+                                                                                                <img src="images/asf-logo.gif"  alt="Apache Software Foundation"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                  <li id="publishDate">Last Published: 2014-01-22</li>
+                      
+                
+                    
+      
+                            </ul>
+      </div>
+
+      
+                
+        <div id="bodyColumn" >
+                                  
+            <h1>Source Code</h1><div class="section"><h2>Source Code<a name="Source_Code"></a></h2><p>As a convenience to developers who are helping to create and maintain the Apache Struts framework, public access to the live source code repository is available. This is our one-and-only development repository. Accordingly, the source may not always compile or be in a release-ready state.</p><p><i>Access at your own risk!</i></p><p>NOTE: The full source code is provided with each <a href="downloads.html">release.</a> If you simply want to build your own copy of the product, use the source code provided with an approved release, rather than the development head.</p><p>Read-only access to the Apache Struts source repository is available through both <a class="externalLink" href="https://git-wip-us.apache.org/repos/asf/struts/repo?p=struts.git;a=summary">web browser</a> and <a class="externalLink" href="http://git-scm.com/">Git client</a> interfaces.</p><p>With the <a class="externalLi
 nk" href="http://git-scm.com/">Git client</a> installed, obtaining a working copy of the Struts codebase is as simple as</p>
+<div class="source"><pre class="prettyprint">&gt; git clone http://git.apache.org/repos/asf/struts.git
+</pre></div><p>(Committers with write access should use the <b>https</b> protocol instead)</p>
+<div class="source"><pre class="prettyprint">&gt; git clone https://git-wip-us.apache.org/repos/asf/struts.git
+</pre></div><p>For more about using version control systems at Apache, see the ASFs <a class="externalLink" href="http://www.apache.org/dev/#version-control">Source Code Repositories</a> page.</p></div><div class="section"><h2>Building Apache Struts<a name="Building_Apache_Struts"></a></h2><p>If you are building Apache Struts from source, we recommend that you install and use <a class="externalLink" href="http://maven.apache.org">Apache Maven 3.</a> During the build process, Maven will automatically acquire whatever external JARs your system may need. (Of course, you can still use your build system of choice to build your own applications!)</p><p>With Maven installed, building a Struts codebase is as simple as</p>
+<div class="source"><pre class="prettyprint">&gt; mvn install
+</pre></div><p>or</p>
+<div class="source"><pre class="prettyprint">&gt; mvn -DskipAssembly=true install
+</pre></div><p>Maven will automatically download any dependencies as needed.</p><p>For more about using Maven to build Struts 2, see <a href="/2.x/docs/building-the-framework-from-source.html">Building the framework from source</a> in the <a href="/2.x/docs/contributors-guide.html">Struts 2 Contributors Guide.</a></p><p>For more about using Maven to build Struts 1, see our <a class="externalLink" href="http://wiki.apache.org/struts/StrutsMaintenanceMaven">Maven wiki page.</a></p></div><div class="section"><h2>NightlyBuilds<a name="NightlyBuilds"></a></h2><p>As part of our continuous integration practice, we also make available each morning the <a class="externalLink" href="https://builds.apache.org/view/S-Z/view/Struts/job/Struts2-JDK6/lastStableBuild/org.apache.struts$struts2-assembly/">latest stable development build.</a></p><p><i>Again: Use at your own risk!</i></p><p>If you do <b>not</b> plan to contribute to the development of the framework, then you probably want to download a
  <a href="downloads.html">release</a></p><p>NOTE: The Struts 2 nightly build is not fully operational. We suggest that contributors checkout the <a href="#SourceCode">source code</a> instead.</p></div><div class="section"><h2>Test Builds<a name="Test_Builds"></a></h2><p>As we prepare for a new release, the project group may create interim <i>test builds</i>. When test builds are available, we post them <a class="externalLink" href="http://people.apache.org/builds/struts/">here</a> in binary, source and library distributions. Library distributions include any external dependencies needed to use a product with your application.</p><p>A test build is made available so that it can be reviewed for quality by the Apache Struts development group. When a build is judged ready for prime time, it is promoted to General Availability status and may be made the Best Available release. If the group feels that a build requires more testing, then it may be marked as Beta release. When a test build 
 is upgraded to Beta or GA by a vote of the project members, we make the distribution available as a formal <a href="downloads.html">release.</a></p></div><div class="section"><h2>Maven Snapshots<a name="Maven_Snapshots"></a></h2><p>When a distribution is first made available, it is rated as a development build or snapshot. Later, the quality of the distribution may be upgraded to Beta or General Availability, based on feedback from the community, and then made available through ibiblio and other public Maven repositories. To obtain an early distribution via Maven, specify the ASF Snapshot repository in the projects POM.</p>
+<div class="source"><pre class="prettyprint">&lt;repositories&gt;
+    &lt;repository&gt;
+        &lt;id&gt;apache.snapshots&lt;/id&gt;
+        &lt;name&gt;ASF Maven 2 Snapshot&lt;/name&gt;
+        &lt;url&gt;https://repository.apache.org/content/groups/snapshots/&lt;/url&gt;
+    &lt;/repository&gt;
+&lt;/repositories&gt;
+</pre></div></div><div class="section"><h2>Licensing of Apache Struts Builds<a name="Licensing_of_Apache_Struts_Builds"></a></h2><p>Apache Struts 2 source code and documentation is licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file included in any distribution for additional information regarding copyright ownership. The ASF licenses the source code and documentation files in our Apache Struts distribution to you under the Apache License, Version 2.0 (the License); you may not use the Apache Struts product except in compliance with the License.</p><p>You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0]</p><p>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 limitati
 ons under the License.</p><p>Next: <a href="releases.html">Release Guidelines</a></p></div>
+                  </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container">
+              <div class="row span12">Copyright &copy;                    2000-2014
+                        <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>
+                  
+                <p id="poweredBy" class="pull-right">
+                          <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>
+              </p>
+        
+                </div>
+    </footer>
+  </body>
+</html>

Added: websites/staging/struts/trunk/content/bylaws.html
==============================================================================
--- websites/staging/struts/trunk/content/bylaws.html (added)
+++ websites/staging/struts/trunk/content/bylaws.html Wed Jan 22 09:37:43 2014
@@ -0,0 +1,245 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Jan 22, 2014
+ | 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="20140122" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title></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="topBarEnabled">
+          
+    
+    
+            
+    
+    
+    <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 id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container"><div class="nav-collapse">
+            
+                
+                                <ul class="nav">
+                          <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache Struts <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="index.html"  title="Welcome">Welcome</a>
+</li>
+                  
+                      <li>      <a href="downloads.html"  title="Downloads">Downloads</a>
+</li>
+                  
+                      <li>      <a href="announce.html"  title="Announcements">Announcements</a>
+</li>
+                  
+                      <li>      <a href="http://www.apache.org/licenses/"  title="License">License</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/thanks.html"  title="Thanks!">Thanks!</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/sponsorship.html"  title="Sponsorship">Sponsorship</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="mail.html"  title="User Mailing List">User Mailing List</a>
+</li>
+                  
+                      <li>      <a href="https://issues.apache.org/jira/browse/WW"  title="Issue Tracker">Issue Tracker</a>
+</li>
+                  
+                      <li>      <a href="security.html"  title="Reporting Security Issues">Reporting Security Issues</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="birdseye.html"  title="Birds Eye">Birds Eye</a>
+</li>
+                  
+                      <li>      <a href="primer.html"  title="Key Technologies">Key Technologies</a>
+</li>
+                  
+                      <li>      <a href="kickstart.html"  title="Kickstart FAQ">Kickstart FAQ</a>
+</li>
+                  
+                      <li>      <a href="https://cwiki.apache.org/confluence/display/WW/Home"  title="Wiki">Wiki</a>
+</li>
+                  
+                      <li>      <a href="../release/2.3.x/index.html"  title="Struts 2">Struts 2</a>
+</li>
+                  
+                      <li>      <a href="../release/1.3.x/index.html"  title="Struts 1">Struts 1</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contributing <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="youatstruts.html"  title="You at Struts">You at Struts</a>
+</li>
+                  
+                      <li>      <a href="helping.html"  title="How to Help FAQ">How to Help FAQ</a>
+</li>
+                  
+                      <li>      <a href="dev/dev-mail.html"  title="Development Lists">Development Lists</a>
+</li>
+                  
+                      <li>      <a href="dev/git-for-struts.html"  title="Git for Struts">Git for Struts</a>
+</li>
+                  
+                      <li>      <a href="dev/troubleshooting-git-svn.html"  title="Troubleshooting Git-Svn">Troubleshooting Git-Svn</a>
+</li>
+                  
+                      <li>      <a href="dev/builds.html"  title="Source Code">Source Code</a>
+</li>
+                  
+                      <li>      <a href="dev/releases.html"  title="Release Guidelines">Release Guidelines</a>
+</li>
+                  
+                      <li>      <a href="dev/bylaws.html"  title="PMC Charter">PMC Charter</a>
+</li>
+                  
+                      <li>      <a href="dev/volunteers.html"  title="Volunteers">Volunteers</a>
+</li>
+                  
+                      <li>      <a href="http://svn.apache.org/viewvc/struts/"  title="Source Repository">Source Repository</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+          
+                                                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
+    
+        <div class="container">
+          <div id="banner">
+        <div class="pull-left">
+                                                  <a href="../" id="bannerLeft">
+                                                                                                <img src="images/struts.gif"  alt="Apache Struts"/>
+                </a>
+                      </div>
+        <div class="pull-right">                  <a href="http://www.apache.org" id="bannerRight">
+                                                                                                <img src="images/asf-logo.gif"  alt="Apache Software Foundation"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                  <li id="publishDate">Last Published: 2014-01-22</li>
+                      
+                
+                    
+      
+                            </ul>
+      </div>
+
+      
+                
+        <div id="bodyColumn" >
+                                  
+            <h1>Project Management Committee Charter</h1><div class="section"><h2>Apache Struts PMC Charter<a name="Apache_Struts_PMC_Charter"></a></h2><p>Struts is a Project of the <a class="externalLink" href="http://apache.org/foundation">Apache Software Foundation</a> (ASF), formed by a resolution of the <a class="externalLink" href="http://apache.org/foundation/board/">ASF Board of Directors</a>. As an ASF Project, Struts is subject to the <a class="externalLink" href="http://apache.org/foundation/bylaws.html">ASF Bylaws</a> and the direction of the ASF Board.</p><p>The Project Charter incorporates by reference the current version of [How the ASF works](<a class="externalLink" href="http://apache.org/foundation/how-it-works.html">http://apache.org/foundation/how-it-works.html</a>, with the additional guidelines and clarifications found herein.</p></div><div class="section"><h2>Roles and Responsibilities<a name="Roles_and_Responsibilities"></a></h2><p>The roles and responsibilit
 ies that people can assume in the project are based on merit. Everybody can help no matter what their role. Those who have been long term or valuable contributors to the project can earn the right to commit directly to the source repository and to cast binding votes during the decision-making process.</p><div class="section"><h3>Users.<a name="Users."></a></h3><p>Users are the people who use the products of the Project. People in this role arent contributing code, but they are using the products, reporting bugs, making feature requests, and such. This is by far the most important category of people as, without users, there is no reason for the Project. When a user starts to contribute code or documentation patches, they become a Contributor.</p></div><div class="section"><h3>Contributors.<a name="Contributors."></a></h3><p>Contributors are the people who write code or documentation patches or contribute positively to the project in other ways. When a volunteers patch is applied, the
  contribution is recognized in the version control log.</p></div><div class="section"><h3>Committers.<a name="Committers."></a></h3><p>Contributors who give frequent and valuable contributions to a subproject of the Project can have their status promoted to that of a <i>Committer</i> for that subproject. A Committer has write access to the source code repository. Committer status is granted by the Project Management Committee by majority vote.</p></div><div class="section"><h3>Project Management Committee (PMC).<a name="Project_Management_Committee_PMC."></a></h3><p>Committers and other volunteers who frequently participate with valuable contributions may have their status promoted to that of a <i>Project Management Committee Member</i>. The PMC is responsible for the day-to-day management of the Project.</p></div></div><div class="section"><h2>Management<a name="Management"></a></h2><p>The Vice President is appointed by the ASF Board. The Vice President is assisted by the Project M
 anagement Committee (PMC) and also serves as the PMC chair. The PMC may nominate new members. Nominees may then be approved with a 3/4 majority vote of the PMC. Membership can be revoked by a unanimous vote of all the active PMC members other than the member in question. The list of active PMC members can be found on our <a href="volunteers.html">Volunteers page</a>.</p></div><div class="section"><h2>PMC Duties<a name="PMC_Duties"></a></h2><p>The PMC is responsible for the day-to-day management of the Struts Project. The PMC oversees all changes made to the codebase. The PMC must ensure that all code under a Apache Struts repository is the lawful property of the Foundation and may be distributed under the <a class="externalLink" href="http://apache.org/licenses/">Apache Software License</a>. All releases of a Struts subproject must be sanctioned by the Project Management Committee.</p></div><div class="section"><h2>Subprojects<a name="Subprojects"></a></h2><p>Subprojects are the Pro
 jects unit of release. Each subproject should represent an implementation of a Struts framework or a related component. Each subproject should focus on creating, maintaining, and releasing a single software product or deliverable.</p><p>All PMC Members have voting rights in all subprojects. Members not familiar with a subproject codebase may abstain from any given vote. All Committers have write access to all subprojects. Subprojects are units of release, not units of work.</p><p>PMC members may propose the creation of new subprojects. Proposals are to contain the scope of the project, identify the initial source from which the project is to be populated, identify any mailing lists or repositories, if any, which are to be created. Creation of a new subproject requires approval by a 3/4 majority vote of the PMC.</p></div><div class="section"><h2>Decision Making<a name="Decision_Making"></a></h2><p>All <a class="externalLink" href="http://apache.org/foundation/how-it-works.html#roles"
 >Volunteers</a> (Users, Developers, Committers, PMC Members) are encouraged to participate in the decision-making process, but binding decisions are made only by the Project Management Committee.</p></div><div class="section"><h2>Voting<a name="Voting"></a></h2><p>Any subscriber to the list may <a class="externalLink" href="http://apache.org/foundation/voting.html">vote</a> on any issue or action item. Votes from Developers and Committers are especially welcome. However, the only binding votes are those cast by a PMC Member.</p><p>The act of voting carries certain obligations. Voters are not only stating their opinion, they are also agreeing to help do the work.</p><p>Each vote can be made in one of three flavors:</p>
+<table border="0" class="table table-striped">
+    <tr class="a">
+        <td>
+            <b>+1</b>
+        </td>
+        <td>
+            &quot;Yes&quot; &quot;Agree,&quot; or &quot;the action should be performed&quot;.
+            On some issues this is only binding if the voter has tested the action on their own system(s).
+        </td>
+    </tr>
+    <tr class="b">
+        <td>
+            <b>+/-0</b>
+        </td>
+        <td>
+            &quot;Abstain&quot;, &quot;no opinion&quot;.
+            An abstention may have detrimental effects if too many people abstain.
+        </td>
+    </tr>
+    <tr class="a">
+        <td>
+            <b>-1</b>
+        </td>
+        <td>
+            &quot;No&quot;.
+
+            On issues where consensus is required, this vote counts as a **veto**.
+            All vetos must contain an explanation of why the veto is appropriate. Vetos with no explanation are void.
+            A veto cannot be overruled. If you disagree with the veto, you should lobby the person who
+            cast the veto. Voters intending to veto an action item should make their opinions known to the group
+            immediately so that the problem can be remedied as early as possible.
+
+            If a Committer tries to &quot;override&quot; a veto by restoring a vetoed change, the PMC may ask the infrastructure
+            group to revoke that Committer's write privileges.
+        </td>
+    </tr>
+</table><p>An action requiring consensus approval must receive at least <b>3 binding +1</b> votes and <b>no binding vetos</b>. An action requiring majority approval must receive at least <b>3 binding +1</b> votes and more <b>+1</b> votes than <b>-1</b> votes. All other action items are considered to have lazy approval until somebody votes<b>-1</b>, after which point they are decided by either consensus or majority vote, depending on the type of action item.</p><p>Voting represent consensus and votes are never final. Circumstances change, and so may votes. A veto may be converted to a +1 after discussion, and likewise a +1 may be converted to a -1. By convention, Committers should allow a vote to circulate for 72 hours before taking action.</p></div><div class="section"><h2>Action Items<a name="Action_Items"></a></h2><p>All decisions revolve around <i>Action Items</i>. Action Items consist of the following: - Long Term Plans - Short Term Plans - Product Changes - Showstoppers (or blo
 ckers) - Release Plan - Release Grade</p><div class="section"><h3>Long Term Plans<a name="Long_Term_Plans"></a></h3><p>Long term plans are simply announcements that group members are working on particular issues related to the Project. These items are not voted on, but Committers and PMC Members who do not agree with a particular plan, or think that an alternative plan would be better, are obligated to inform the group of their feelings.</p></div><div class="section"><h3>Short Term Plan<a name="Short_Term_Plan"></a></h3><p>Short term plans are announcements that a volunteer is working on a particular set of documentation or code files with the implication that other volunteers should avoid them or try to coordinate their changes.</p></div><div class="section"><h3>Product Changes<a name="Product_Changes"></a></h3><p>All product changes to the repository are subject to lazy consensus.</p></div><div class="section"><h3>Showstoppers<a name="Showstoppers"></a></h3><p>Showstoppers are iss
 ues that require a fix be in place before the next public release. They are designated as blockers in the issue tracker in order to focus special attention on these problems. An issue becomes a showstopper when it is designated as such in the issue tracker by a PMC member and remains so by lazy consensus.</p></div><div class="section"><h3>Release Plan<a name="Release_Plan"></a></h3><p>A release plan must be used to keep all volunteers aware of when a release is desired, whether it will be a major, minor, or milestone release, who will be the release manager, when the repository will be tagged to create the distribution, and other assorted information to keep volunteers from tripping over each other. A release plan must be incorporated into the product documentation, or otherwise announced to the DEV list. Lazy majority decides each issue in a release plan.</p></div><div class="section"><h3>Release Grade<a name="Release_Grade"></a></h3><p>After a proposed release is built, it must be
  tested and classified before being released to the general public. The proposed release may be assigned Alpha, Beta or General Availability classifications by majority vote. Once a release is classified by the PMC Members, it may be distributed to the general public on behalf of the Foundation. Distributions may be reclassified or withdrawn by majority vote, but the release number may not be reused by another distribution.</p></div></div><div class="section"><h2>Sandbox<a name="Sandbox"></a></h2><p>Pursuant to the <a class="externalLink" href="http://incubator.apache.org/learn/rules-for-revolutionaries.html">Rules for Revolutionaries</a>, any committer may submit experimental material to the Sandbox area of the repository at his or her own discretion.</p><p>Material must be moved from the sandbox to the main repository before it can be released.</p><p>If a sandbox whiteboard becomes dormant for six or more months, it may be moved to the archive section of the repository.</p><p>Expe
 rimental material that is outside the scope of the Struts project may also be submitted to the <a class="externalLink" href="http://labs.apache.org/">Apache Labs</a></p><p>Next: <a href="volunteers.html">Volunteers</a></p></div>
+                  </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container">
+              <div class="row span12">Copyright &copy;                    2000-2014
+                        <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>
+                  
+                <p id="poweredBy" class="pull-right">
+                          <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>
+              </p>
+        
+                </div>
+    </footer>
+  </body>
+</html>

Added: websites/staging/struts/trunk/content/dev-mail.html
==============================================================================
--- websites/staging/struts/trunk/content/dev-mail.html (added)
+++ websites/staging/struts/trunk/content/dev-mail.html Wed Jan 22 09:37:43 2014
@@ -0,0 +1,234 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Jan 22, 2014
+ | 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="20140122" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title></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="topBarEnabled">
+          
+    
+    
+            
+    
+    
+    <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 id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container"><div class="nav-collapse">
+            
+                
+                                <ul class="nav">
+                          <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache Struts <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="index.html"  title="Welcome">Welcome</a>
+</li>
+                  
+                      <li>      <a href="downloads.html"  title="Downloads">Downloads</a>
+</li>
+                  
+                      <li>      <a href="announce.html"  title="Announcements">Announcements</a>
+</li>
+                  
+                      <li>      <a href="http://www.apache.org/licenses/"  title="License">License</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/thanks.html"  title="Thanks!">Thanks!</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/sponsorship.html"  title="Sponsorship">Sponsorship</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="mail.html"  title="User Mailing List">User Mailing List</a>
+</li>
+                  
+                      <li>      <a href="https://issues.apache.org/jira/browse/WW"  title="Issue Tracker">Issue Tracker</a>
+</li>
+                  
+                      <li>      <a href="security.html"  title="Reporting Security Issues">Reporting Security Issues</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="birdseye.html"  title="Birds Eye">Birds Eye</a>
+</li>
+                  
+                      <li>      <a href="primer.html"  title="Key Technologies">Key Technologies</a>
+</li>
+                  
+                      <li>      <a href="kickstart.html"  title="Kickstart FAQ">Kickstart FAQ</a>
+</li>
+                  
+                      <li>      <a href="https://cwiki.apache.org/confluence/display/WW/Home"  title="Wiki">Wiki</a>
+</li>
+                  
+                      <li>      <a href="../release/2.3.x/index.html"  title="Struts 2">Struts 2</a>
+</li>
+                  
+                      <li>      <a href="../release/1.3.x/index.html"  title="Struts 1">Struts 1</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contributing <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="youatstruts.html"  title="You at Struts">You at Struts</a>
+</li>
+                  
+                      <li>      <a href="helping.html"  title="How to Help FAQ">How to Help FAQ</a>
+</li>
+                  
+                      <li>      <a href="dev/dev-mail.html"  title="Development Lists">Development Lists</a>
+</li>
+                  
+                      <li>      <a href="dev/git-for-struts.html"  title="Git for Struts">Git for Struts</a>
+</li>
+                  
+                      <li>      <a href="dev/troubleshooting-git-svn.html"  title="Troubleshooting Git-Svn">Troubleshooting Git-Svn</a>
+</li>
+                  
+                      <li>      <a href="dev/builds.html"  title="Source Code">Source Code</a>
+</li>
+                  
+                      <li>      <a href="dev/releases.html"  title="Release Guidelines">Release Guidelines</a>
+</li>
+                  
+                      <li>      <a href="dev/bylaws.html"  title="PMC Charter">PMC Charter</a>
+</li>
+                  
+                      <li>      <a href="dev/volunteers.html"  title="Volunteers">Volunteers</a>
+</li>
+                  
+                      <li>      <a href="http://svn.apache.org/viewvc/struts/"  title="Source Repository">Source Repository</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+          
+                                                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
+    
+        <div class="container">
+          <div id="banner">
+        <div class="pull-left">
+                                                  <a href="../" id="bannerLeft">
+                                                                                                <img src="images/struts.gif"  alt="Apache Struts"/>
+                </a>
+                      </div>
+        <div class="pull-right">                  <a href="http://www.apache.org" id="bannerRight">
+                                                                                                <img src="images/asf-logo.gif"  alt="Apache Software Foundation"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                  <li id="publishDate">Last Published: 2014-01-22</li>
+                      
+                
+                    
+      
+                            </ul>
+      </div>
+
+      
+                
+        <div id="bodyColumn" >
+                                  
+            <h1>Dev Mailing List</h1><div class="section"><h2>Development Lists<a name="Development_Lists"></a></h2><p>The following mailing lists are meant for people who want to contribute to Struts itself. Patches, Documentation improvements and discussion on future Struts are welcome. **For questions on using Struts, please subscribe to the <a href="mail.html">user list</a>**.</p><p>Please make sure you have read the guidelines on <a href="mail.html">this page</a></p>
+<table border="0" class="table table-striped">
+    <tr class="a">
+        <th>Name</th>
+        <th>Subscribe</th>
+        <th>Unsubscribe</th>
+        <th>Description</th>
+    </tr>
+    <tr class="b">
+        <td>Struts-Dev</td>
+        <td><a class="externalLink" href="mailto:dev-subscribe@struts.apache.org?subject=subscribe&amp;body=subscribe"></a></td>
+        <td><a class="externalLink" href="mailto:dev-unsubscribe@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe">dev-unsubscribe@struts.apache.org</a></td>
+        <td>Contact other developers interested in expanding and improving Struts functionality.</td>
+    </tr>
+    <tr class="a">
+        <td>Struts-Commits</td>
+        <td><a class="externalLink" href="mailto:commits-subscribe@struts.apache.org?subject=subscribe&amp;body=subscribe">commits-subscribe@struts.apache.org</a></td>
+        <td><a class="externalLink" href="mailto:commits-unsubscribe@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe">commits-unsubscribe@struts.apache.org</a></td>
+        <td>Receive notifications of changes to the Struts source code repository.</td>
+    </tr>
+    <tr class="b">
+        <td>Struts-Issues</td>
+        <td><a class="externalLink" href="mailto:issues-subscribe@struts.apache.org?subject=subscribe&amp;body=subscribe">issues-subscribe@struts.apache.org</a></td>
+        <td><a class="externalLink" href="mailto:issues-unsubscribe@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe">issues-unsubscribe@struts.apache.org</a></td>
+        <td>Receive notifications from the Struts issue tracker.</td>
+    </tr>
+</table></div><div class="section"><h2>Archives<a name="Archives"></a></h2><p>You can read the <a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/struts-dev/">ASF Mail</a> or the <a class="externalLink" href="http://markmail.org/list/org.apache.struts.dev/">Mark Mail</a> archives if you are looking for older discussions. There are many other archives out there as well.</p></div>
+                  </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container">
+              <div class="row span12">Copyright &copy;                    2000-2014
+                        <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>
+                  
+                <p id="poweredBy" class="pull-right">
+                          <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>
+              </p>
+        
+                </div>
+    </footer>
+  </body>
+</html>

Modified: websites/staging/struts/trunk/content/download.html
==============================================================================
--- websites/staging/struts/trunk/content/download.html (original)
+++ websites/staging/struts/trunk/content/download.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Download a Release</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/downloads.html
==============================================================================
--- websites/staging/struts/trunk/content/downloads.html (original)
+++ websites/staging/struts/trunk/content/downloads.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Releases</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/faqs.html
==============================================================================
--- websites/staging/struts/trunk/content/faqs.html (original)
+++ websites/staging/struts/trunk/content/faqs.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         FAQs</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Added: websites/staging/struts/trunk/content/git-for-struts.html
==============================================================================
--- websites/staging/struts/trunk/content/git-for-struts.html (added)
+++ websites/staging/struts/trunk/content/git-for-struts.html Wed Jan 22 09:37:43 2014
@@ -0,0 +1,266 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Jan 22, 2014
+ | 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="20140122" />
+    <meta http-equiv="Content-Language" content="en" />
+    <title></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="topBarEnabled">
+          
+    
+    
+            
+    
+    
+    <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 id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container"><div class="nav-collapse">
+            
+                
+                                <ul class="nav">
+                          <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache Struts <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="index.html"  title="Welcome">Welcome</a>
+</li>
+                  
+                      <li>      <a href="downloads.html"  title="Downloads">Downloads</a>
+</li>
+                  
+                      <li>      <a href="announce.html"  title="Announcements">Announcements</a>
+</li>
+                  
+                      <li>      <a href="http://www.apache.org/licenses/"  title="License">License</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/thanks.html"  title="Thanks!">Thanks!</a>
+</li>
+                  
+                      <li>      <a href="http://apache.org/foundation/sponsorship.html"  title="Sponsorship">Sponsorship</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="mail.html"  title="User Mailing List">User Mailing List</a>
+</li>
+                  
+                      <li>      <a href="https://issues.apache.org/jira/browse/WW"  title="Issue Tracker">Issue Tracker</a>
+</li>
+                  
+                      <li>      <a href="security.html"  title="Reporting Security Issues">Reporting Security Issues</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="birdseye.html"  title="Birds Eye">Birds Eye</a>
+</li>
+                  
+                      <li>      <a href="primer.html"  title="Key Technologies">Key Technologies</a>
+</li>
+                  
+                      <li>      <a href="kickstart.html"  title="Kickstart FAQ">Kickstart FAQ</a>
+</li>
+                  
+                      <li>      <a href="https://cwiki.apache.org/confluence/display/WW/Home"  title="Wiki">Wiki</a>
+</li>
+                  
+                      <li>      <a href="../release/2.3.x/index.html"  title="Struts 2">Struts 2</a>
+</li>
+                  
+                      <li>      <a href="../release/1.3.x/index.html"  title="Struts 1">Struts 1</a>
+</li>
+                          </ul>
+      </li>
+                <li class="dropdown">
+        <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contributing <b class="caret"></b></a>
+        <ul class="dropdown-menu">
+        
+                      <li>      <a href="youatstruts.html"  title="You at Struts">You at Struts</a>
+</li>
+                  
+                      <li>      <a href="helping.html"  title="How to Help FAQ">How to Help FAQ</a>
+</li>
+                  
+                      <li>      <a href="dev/dev-mail.html"  title="Development Lists">Development Lists</a>
+</li>
+                  
+                      <li>      <a href="dev/git-for-struts.html"  title="Git for Struts">Git for Struts</a>
+</li>
+                  
+                      <li>      <a href="dev/troubleshooting-git-svn.html"  title="Troubleshooting Git-Svn">Troubleshooting Git-Svn</a>
+</li>
+                  
+                      <li>      <a href="dev/builds.html"  title="Source Code">Source Code</a>
+</li>
+                  
+                      <li>      <a href="dev/releases.html"  title="Release Guidelines">Release Guidelines</a>
+</li>
+                  
+                      <li>      <a href="dev/bylaws.html"  title="PMC Charter">PMC Charter</a>
+</li>
+                  
+                      <li>      <a href="dev/volunteers.html"  title="Volunteers">Volunteers</a>
+</li>
+                  
+                      <li>      <a href="http://svn.apache.org/viewvc/struts/"  title="Source Repository">Source Repository</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+          
+                                                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
+    
+        <div class="container">
+          <div id="banner">
+        <div class="pull-left">
+                                                  <a href="../" id="bannerLeft">
+                                                                                                <img src="images/struts.gif"  alt="Apache Struts"/>
+                </a>
+                      </div>
+        <div class="pull-right">                  <a href="http://www.apache.org" id="bannerRight">
+                                                                                                <img src="images/asf-logo.gif"  alt="Apache Software Foundation"/>
+                </a>
+      </div>
+        <div class="clear"><hr/></div>
+      </div>
+
+      <div id="breadcrumbs">
+        <ul class="breadcrumb">
+                
+                    
+                  <li id="publishDate">Last Published: 2014-01-22</li>
+                      
+                
+                    
+      
+                            </ul>
+      </div>
+
+      
+                
+        <div id="bodyColumn" >
+                                  
+            <h1>Using Git with Struts</h1><p>So far, Struts 2 is using SVN. There are plans to move on to GIT but the plannings have not been completed yet. In addition well only move with new versions of Struts to Git. Struts 1 will stay in SVN.</p><p>Luckily there is a way to work with Git backed by SVN. This document explains, how a developer:</p>
+<ul>
+  <li>can work on outdated code like Struts 1 with Git</li>
+  <li>can synchronize Git from Github with the Struts 2 repository</li>
+</ul><p>This page reflects some knowledge from the <a class="externalLink" href="http://wiki.apache.org/general/GitAtApache">Git at Apache project</a>.</p><div class="section"><h2>Setting up your Struts environment<a name="Setting_up_your_Struts_environment"></a></h2>
+<div class="source"><pre class="prettyprint">git clone git://git.apache.org/struts2.git
+cd struts2/.git
+wget http://git.apache.org/authors.txt
+cd ..
+git config svn.authorsfile &quot;.git/authors.txt&quot;
+
+# check if your username and email are identical to those in the author file
+git config user.name
+git config user.email
+
+# if they are not identical, set the ASF values locally
+# git config user.name &lt;Your Name&gt;
+# git config user.email &lt;Your Email&gt;
+
+git svn init --prefix=originsvn/ -s https://svn.apache.org/repos/asf/struts/struts2/
+git svn rebase
+</pre></div><p>You might need to accept SSL certificates from Apache. Please check the <a class="externalLink" href="http://www.apache.org/dev/machines">fingerprint of the servers</a>. If in doubt, ask at Struts mailing list or Apache infra. </p><p>If you are frequently asked on the certificates or if you get that error:</p>
+<div class="source"><pre class="prettyprint">Unable to determine upstream SVN information from working tree history
+</pre></div><p>then you should make sure you are using SVN version 1.7 (not 1.8, not 1.6). Please also consult the <a href="troubleshooting-git-svn.html">troubleshooting page</a>.</p><p>You can go on for now and ignore this message. After this, youll need to fetch the old history.</p>
+<div class="source"><pre class="prettyprint">git svn fetch --log-window-size 10000
+</pre></div><p>Heads up: this command above will need a good while to run - please plan accordingly. When you change something in the code, you can commit it with:</p>
+<div class="source"><pre class="prettyprint">git svn dcommit
+</pre></div><p>This will commit all your git commits to svn. One git commit == 1 svn revision. Consider rebase. Please dont forget, there is the dry-run option, which tests the commit only.</p><p>It will output things like:</p>
+<div class="source"><pre class="prettyprint">diff-tree 56bfadfc12a8129e5ea6668714fae34704242636~1 56bfadfc12a8129e5ea6668714fae34704242636
+</pre></div><p>You can watch the modification with git again:</p>
+<div class="source"><pre class="prettyprint">git diff-tree 56bfadfc12a8129e5ea6668714fae34704242636~1 56bfadfc12a8129e5ea6668714fae34704242636
+</pre></div><p>Which will output for example:</p>
+<div class="source"><pre class="prettyprint">:000000 100644 0000000000000000000000000000000000000000 e2b24b623fc1cf2d0316a48bb1d69a9eeb7e0719 A  .gitignore
+</pre></div></div><div class="section"><h2>Working with SVN branches<a name="Working_with_SVN_branches"></a></h2><p>Create a new local branch and switch to it in GIT:</p>
+<div class="source"><pre class="prettyprint">git checkout -b mybranch-svn origin/mybranch
+</pre></div><p>Map the GIT branch to the according SVN branch:</p>
+<div class="source"><pre class="prettyprint">git reset --hard origin/mybranch
+</pre></div><p>For reference, you can override the commit url:</p>
+<div class="source"><pre class="prettyprint">git svn dcommit --commit-url https://svn.apache.org/repos/asf/struts/struts2/branches/mybranch
+</pre></div></div><div class="section"><h2>Contributing with GitHub<a name="Contributing_with_GitHub"></a></h2><p>If you would like to contribute using the GitHub tools you need to know we can only accept your work if we have your <a class="externalLink" href="http://www.apache.org/licenses/icla.txt">ICLA</a> on file. Please read the document carefully, sign and send it to us. Basically this document protects you and the end users for legal problems. It allows the Apache Software Foundation to use your code and distribute it. You should receive an email a few days after you submitted it and appear in the <a class="externalLink" href="http://people.apache.org/committer-index.html">committer index</a> in the section unlisted CLAs.</p><p>Once done, you can clone the <a class="externalLink" href="https://github.com/apache/struts2">Apache Struts mirror on GitHub</a>:</p>
+<div class="source"><pre class="prettyprint">git clone git@github.com:apache/struts2.git struts2-mirror.git
+</pre></div><p>Please create an issue on our <a class="externalLink" href="https://issues.apache.org/jira/browse/WW">issue tracker</a>. Youll receive an issue number which you should use to create a working branch (for example WW-4196).</p><p>If you are sending a pull request, please send it to the Apache Struts teams repo and not the official mirror. We cannot accept and close pull requests there which is the reason we have an own account. You can find it here:</p><p><a class="externalLink" href="https://github.com/apachestruts/struts2">https://github.com/apachestruts/struts2</a></p><p>Please send the pull request to trunk.</p><p>It is of course possible to add us as upstream repo:</p>
+<div class="source"><pre class="prettyprint">git remote add upstream git@github.com:apachestruts/struts2
+</pre></div></div><div class="section"><h2>Working with remote branches from GitHub<a name="Working_with_remote_branches_from_GitHub"></a></h2><p>You can add a remote branch from GitHub like this:</p>
+<div class="source"><pre class="prettyprint">git remote add opensourceio https://github.com/opensourceio/struts.git
+</pre></div><p>Pull changes with:</p>
+<div class="source"><pre class="prettyprint">git pull opensourceio anotherbranch
+</pre></div><p>When merge conflicts happen, these can be resolved using:</p>
+<div class="source"><pre class="prettyprint">git mergetool
+</pre></div><p>After the merge, you need to commit the changes to svn with:</p>
+<div class="source"><pre class="prettyprint">git svn dcommit
+</pre></div></div><div class="section"><h2>What, if the svn commit goes wrong<a name="What_if_the_svn_commit_goes_wrong"></a></h2><p>When git svn messed up the repository, you just can revert the SVN revision. Reverting in SVN is basically merging a previous commit. Like:</p>
+<div class="source"><pre class="prettyprint">svn merge -r1521783:1521602 .
+svn commit -m 'reverted wrong git svn dcommit' .
+</pre></div></div><div class="section"><h2>Further reading<a name="Further_reading"></a></h2>
+<ul>
+  <li><a class="externalLink" href="http://wiki.apache.org/general/GitAtApache">Git at Apache</a></li>
+  <li><a class="externalLink" href="http://www.robbyonrails.com/articles/2008/04/10/git-svn-is-a-gateway-drug">git-svn is a gateway drug</a></li>
+</ul></div>
+                  </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container">
+              <div class="row span12">Copyright &copy;                    2000-2014
+                        <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>
+                  
+                <p id="poweredBy" class="pull-right">
+                          <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>
+              </p>
+        
+                </div>
+    </footer>
+  </body>
+</html>

Modified: websites/staging/struts/trunk/content/helping.html
==============================================================================
--- websites/staging/struts/trunk/content/helping.html (original)
+++ websites/staging/struts/trunk/content/helping.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>How to Help FAQ</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -166,7 +166,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/index.html
==============================================================================
--- websites/staging/struts/trunk/content/index.html (original)
+++ websites/staging/struts/trunk/content/index.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Welcome to the Apache Struts project</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/javadoc.html
==============================================================================
--- websites/staging/struts/trunk/content/javadoc.html (original)
+++ websites/staging/struts/trunk/content/javadoc.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Javadoc Index</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/kickstart.html
==============================================================================
--- websites/staging/struts/trunk/content/kickstart.html (original)
+++ websites/staging/struts/trunk/content/kickstart.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Kickstart FAQ</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" />
@@ -166,7 +166,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>
                       
                 
                     

Modified: websites/staging/struts/trunk/content/mail.html
==============================================================================
--- websites/staging/struts/trunk/content/mail.html (original)
+++ websites/staging/struts/trunk/content/mail.html Wed Jan 22 09:37:43 2014
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
+ | Generated by Apache Maven Doxia at Jan 22, 2014
  | 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="20140115" />
+    <meta name="Date-Revision-yyyymmdd" content="20140122" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Mailing Lists</title>
@@ -167,7 +167,7 @@
         <ul class="breadcrumb">
                 
                     
-                  <li id="publishDate">Last Published: 2014-01-15</li>
+                  <li id="publishDate">Last Published: 2014-01-22</li>