struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r877899 [4/11] - in /websites/staging/struts/trunk/content: ./ css/ dev/ images/
Date Tue, 10 Sep 2013 12:01:50 GMT
Modified: websites/staging/struts/trunk/content/dev/dev-mail.html
==============================================================================
--- websites/staging/struts/trunk/content/dev/dev-mail.html (original)
+++ websites/staging/struts/trunk/content/dev/dev-mail.html Tue Sep 10 12:01:49 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Sep 5, 2013
+ | Generated by Apache Maven Doxia at Sep 10, 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="20130905" />
+    <meta name="Date-Revision-yyyymmdd" content="20130910" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Dev Mailing List</title>
@@ -20,7 +20,7 @@
 
     
             </head>
-        <body class="topBarDisabled">
+        <body class="topBarEnabled">
           
     
     
@@ -33,262 +33,148 @@
         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-09-05</li>
-                      
                 
-                    
-      
-                                              
-    <li class="pull-right">              <a href="../../release/1.3.x/index.html" title="Struts 1 (EOL)">
-        Struts 1 (EOL)</a>
-  </li>
-
-        <li class="divider pull-right">|</li>
-      
-    <li class="pull-right">              <a href="../../release/2.3.x/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 id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container"><div class="nav-collapse">
             
-      <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>
+                                <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="http://people.apache.org/~vgritsenko/stats/projects/struts" class="externalLink" title="Website Stats">
-          <i class="none"></i>
-        Website Stats</a>
-            </li>
+                      <li>      <a href="../downloads.html"  title="Downloads">Downloads</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="../announce.html"  title="Announcements">Announcements</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="../../release/2.3.x/index.html" title="Struts 2.3.15.1 (GA)">
-          <i class="none"></i>
-        Struts 2.3.15.1 (GA)</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="../../release/1.3.x/index.html" title="Struts 1.3.10 (GA) - EOL">
-          <i class="none"></i>
-        Struts 1.3.10 (GA) - EOL</a>
-            </li>
+                      <li>      <a href="https://issues.apache.org/jira/browse/WW"  title="Issue Tracker">Issue Tracker</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="../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="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="../primer.html"  title="Key Technologies">Key Technologies</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="../../development/2.x/index.html" title="Struts 2.x Draft Docs">
-          <i class="none"></i>
-        Struts 2.x Draft Docs</a>
-            </li>
+                      <li>      <a href="../kickstart.html"  title="Kickstart FAQ">Kickstart FAQ</a>
+</li>
                   
-      <li>
-    
-                          <a href="../struts1eol-announcement.html" title="Struts 1.x EOL Announcement">
-          <i class="none"></i>
-        Struts 1.x EOL Announcement</a>
-            </li>
+                      <li>      <a href="../../release/2.3.x/index.html"  title="Struts 2.3.x">Struts 2.3.x</a>
+</li>
+                  
+                      <li>      <a href="../../release/1.3.x/index.html"  title="Struts 1.3.x">Struts 1.3.x</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">
-          <i class="none"></i>
-        How to Help FAQ</a>
-            </li>
+                      <li>      <a href="../helping.html"  title="How to Help FAQ">How to Help FAQ</a>
+</li>
                   
-      <li class="active">
-    
-            <a href="#"><i class="none"></i>Development Lists</a>
-          </li>
+                      <li>      <a href="../dev/dev-mail.html"  title="Development Lists">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/git-for-struts.html"  title="Git for Struts">Git for Struts</a>
+</li>
                   
-      <li>
-    
-                          <a href="../dev/releases.html" title="Release Guidelines">
-          <i class="none"></i>
-        Release Guidelines</a>
-            </li>
+                      <li>      <a href="../dev/troubleshooting-git-svn.html"  title="Troubleshooting Git-Svn">Troubleshooting Git-Svn</a>
+</li>
                   
-      <li>
-    
-                          <a href="../dev/bylaws.html" title="PMC Charter">
-          <i class="none"></i>
-        PMC Charter</a>
-            </li>
+                      <li>      <a href="../dev/builds.html"  title="Source Code">Source Code</a>
+</li>
                   
-      <li>
-    
-                          <a href="../dev/minutes.html" title="Minutes">
-          <i class="none"></i>
-        Minutes</a>
-            </li>
+                      <li>      <a href="../dev/releases.html"  title="Release Guidelines">Release Guidelines</a>
+</li>
                   
-      <li>
-    
-                          <a href="../dev/volunteers.html" title="Volunteers">
-          <i class="none"></i>
-        Volunteers</a>
-            </li>
+                      <li>      <a href="../dev/bylaws.html"  title="PMC Charter">PMC Charter</a>
+</li>
                   
-      <li>
-    
-                          <a href="../../struts-sandbox/index.html" title="Sandbox">
-          <i class="none"></i>
-        Sandbox</a>
-            </li>
+                      <li>      <a href="../dev/volunteers.html"  title="Volunteers">Volunteers</a>
+</li>
                   
-      <li>
+                      <li>      <a href="http://svn.apache.org/viewvc/struts/"  title="Source Repository">Source Repository</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+          
+                                                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
     
-                          <a href="http://svn.apache.org/viewvc/struts/" class="externalLink" title="Source Repository">
-          <i class="none"></i>
-        Source Repository</a>
-            </li>
-            </ul>
+        <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: 2013-09-10</li>
+                      
                 
-          <hr class="divider" />
+                    
+      
+                            </ul>
+      </div>
 
-           <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" >
+        <div id="bodyColumn" >
                                   
             <!-- Copyright 1999-2005 The Apache Software Foundation
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -302,192 +188,65 @@ distributed under the License is distrib
 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>Development Lists<a name="Development_Lists"></a></h2>
-
-            <p>
-                The project hosts several mailing lists. The
-                <a href="../mail.html">user list</a> is devoted to product support.
-                The project also hosts several product development lists.
-                <b>For help using Struts,
-                subscribe to <a href="../mail.html">user list.</a></b>
-            </p>
-
-
-            <div class="section"><h3>Archives<a name="Archives"></a></h3>
-                <p>Archives Carrying Struts Development Lists</p>
-                <ul>
-                    <li>
-                        <a class="externalLink" href="http://mail-archives.apache.org/">ASF Mail
-                            Archives</a>
-                    </li>
-                    <ul>
-                        <li>
-                            <a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/struts-dev/">
-                            Dev. list</a>
-                        </li>
-                        <li>
-                            <a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/struts-commits/">
-                            Commits list</a>
-                        </li>
-                        <li>
-                            <a class="externalLink" href="http://mail-archives.apache.org/mod_mbox/struts-issues/">
-                            Issues list</a>
-                        </li>
-
-                   </ul>
-
-                    <li>
-                        <a class="externalLink" href="http://struts.markmail.org/">Mark Mail</a>
-                    </li>
-                    <ul>
-                        <li>
-                            <a class="externalLink" href="http://struts.markmail.org/search/?q=type:announcements/">
-                                Announcements</a>
-                        </li>
-                        <li>
-                            <a class="externalLink" href="http://markmail.org/list/org.apache.struts.dev/">
-                                Dev. list</a>
-                        </li>
-                        <li>
-                            <a class="externalLink" href="http://markmail.org/list/org.apache.struts.commits/">
-                            Commits list</a>
-                        </li>
-                        <li>
-                            <a class="externalLink" href="http://markmail.org/list/org.apache.struts.issues/">
-                            Issues list</a>
-                        </li>
-                    </ul>
-
-                    <li>Mail-Archive</li>
-                    <ul>
-                        <li>
-                            <a class="externalLink" href="http://www.mail-archive.com/dev%40struts.apache.org/">
-                                Dev. list</a>
-                        </li>
-                    </ul>
-
-                    <li>Gmane</li>
-                    <ul>
-                        <li>
-                            <a class="externalLink" href="http://news.gmane.org/gmane.comp.jakarta.struts.devel/">
-                                Dev. List</a>
-                        </li>
-                    </ul>
-
-                    <li>Mailing list ARChives</li>
-                    <ul>
-                        <li>
-                            <a class="externalLink" href="http://marc.theaimsgroup.com/?l=struts-dev&amp;r=1&amp;w=2">
-                                Dev. List</a>
-                        </li>
-                    </ul>
-
-                    <li>Nabble</li>
-                    <ul>
-                        <li>
-                            <a class="externalLink" href="http://www.nabble.com/Struts---Dev-f205.html">
-                                Dev. List</a>
-                        </li>
-                    </ul>
-
-                    <li>Open Symphony</li>
-                    <ul>
-                        <li>
-                            <a class="externalLink" href="http://forums.opensymphony.com/forum.jspa?forumID=34">
-                                Dev. List (as a Forum)</a>
-                        </li>
-                    </ul>
-
-                </ul>
-            </div>
-
-            <div class="section"><h3>Subscribing<a name="Subscribing"></a></h3>
-                <p>
-                    If you've read the
-                    <a href="../mail.html">guidelines</a>,
-                    please subscribe to whichever
-                    Struts development lists are of interest.
-                </p>
-
-                <ul>
-
-                    <li>
-                        <b>STRUTS-DEV Mailing List</b>
-                        - Subscribe to this mailing
-                        list to communicate with other developers interested
-                        in expanding and
-                        improving the functionality supported by Struts
-                        itself.
-                        <br />
-                        [
-                        <a class="externalLink" href="mailto:dev-subscribe@struts.apache.org?subject=subscribe&amp;body=subscribe">
-                            Subscribe</a>
-                        ]
-                        <br />
-                        [
-                        <a class="externalLink" href="mailto:dev-unsubscribe@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe">
-                            Unsubscribe</a>
-                        ]
-                    </li>
-
-                    <li>
-                        <b>STRUTS-COMMITS Mailing List</b>
-                        - Subscribe to this mailing
-                        to receive notifications of changes to the Struts
-                        source code repository.
-                        <br />
-                        [
-                        <a class="externalLink" href="mailto:commits-subscribe@struts.apache.org?subject=subscribe&amp;body=subscribe">
-                            Subscribe</a>
-                        ]
-                        <br />
-                        [
-                        <a class="externalLink" href="mailto:commits-unsubscribe@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe">
-                            Unsubscribe</a>
-                        ]
-                    </li>
-                    <li>
-                        <b>STRUTS-ISSUES Mailing List</b>
-                        - Subscribe to this mailing
-                        to receive notifications from the Struts JIRA issue
-                        tracker.
-                        <br />
-                        [
-                        <a class="externalLink" href="mailto:issues-subscribe@struts.apache.org?subject=subscribe&amp;body=subscribe">
-                            Subscribe</a>
-                        ]
-                        <br />
-                        [
-                        <a class="externalLink" href="mailto:issues-unsubscribe@struts.apache.org?subject=unsubscribe&amp;body=unsubscribe">
-                            Unsubscribe</a>
-                        ]
-                    </li>
-
-                </ul>
-
-            </div>
-        </div>
-
-        <div class="section"><h2><a name="null"></a></h2>
-            <p class="right">
-                <b>Next:</b>
-                <a href="builds.html">Source Code</a>
-            </p>
+        <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.
+            <b>For questions on using Struts, please subscribe to the
+            <a href="../mail.html">user list.</a></b>
+        </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">dev-subscribe@struts.apache.org</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>
+
+        <a name="Archives"></a>
+        <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>
           </div>
 
     <hr/>
 
     <footer>
-            <div class="container-fluid">
+            <div class="container">
               <div class="row span12">Copyright &copy;                    2000-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
@@ -498,6 +257,11 @@ limitations under the License. --><!-- /
 <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>

Added: websites/staging/struts/trunk/content/dev/git-for-struts.html
==============================================================================
--- websites/staging/struts/trunk/content/dev/git-for-struts.html (added)
+++ websites/staging/struts/trunk/content/dev/git-for-struts.html Tue Sep 10 12:01:49 2013
@@ -0,0 +1,250 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Sep 10, 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="20130910" />
+    <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="../../release/2.3.x/index.html"  title="Struts 2.3.x">Struts 2.3.x</a>
+</li>
+                  
+                      <li>      <a href="../../release/1.3.x/index.html"  title="Struts 1.3.x">Struts 1.3.x</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: 2013-09-10</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=origin/ --tags=tags --trunk=trunk --branches=branches 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 fingerprint of the servers. If in doubt, ask at Struts mailing list if somebody can confirm the server. It also might happen that the last command quits with:</p>
+<div class="source"><pre class="prettyprint">Unable to determine upstream SVN information from working tree history
+</pre></div><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.</p></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>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>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-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>
+                  
+                <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/dev/releases.html
==============================================================================
--- websites/staging/struts/trunk/content/dev/releases.html (original)
+++ websites/staging/struts/trunk/content/dev/releases.html Tue Sep 10 12:01:49 2013
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!--
- | Generated by Apache Maven Doxia at Sep 5, 2013
+ | Generated by Apache Maven Doxia at Sep 10, 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="20130905" />
+    <meta name="Date-Revision-yyyymmdd" content="20130910" />
     <meta http-equiv="Content-Language" content="en" />
     <title>
         Release Guidelines</title>
@@ -20,7 +20,7 @@
 
     
             </head>
-        <body class="topBarDisabled">
+        <body class="topBarEnabled">
           
     
     
@@ -33,262 +33,148 @@
         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-09-05</li>
-                      
                 
-                    
-      
-                                              
-    <li class="pull-right">              <a href="../../release/1.3.x/index.html" title="Struts 1 (EOL)">
-        Struts 1 (EOL)</a>
-  </li>
-
-        <li class="divider pull-right">|</li>
-      
-    <li class="pull-right">              <a href="../../release/2.3.x/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 id="topbar" class="navbar navbar-fixed-top ">
+      <div class="navbar-inner">
+                                  <div class="container"><div class="nav-collapse">
             
-      <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>
+                                <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="http://apache.org/foundation/thanks.html" class="externalLink" title="Thanks!">
-          <i class="none"></i>
-        Thanks!</a>
-            </li>
+                      <li>      <a href="../downloads.html"  title="Downloads">Downloads</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="../announce.html"  title="Announcements">Announcements</a>
+</li>
                   
-      <li>
-    
-                          <a href="../../release/2.3.x/index.html" title="Struts 2.3.15.1 (GA)">
-          <i class="none"></i>
-        Struts 2.3.15.1 (GA)</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="../../release/1.3.x/index.html" title="Struts 1.3.10 (GA) - EOL">
-          <i class="none"></i>
-        Struts 1.3.10 (GA) - EOL</a>
-            </li>
+                      <li>      <a href="https://issues.apache.org/jira/browse/WW"  title="Issue Tracker">Issue Tracker</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="../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="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="../primer.html"  title="Key Technologies">Key Technologies</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="../../development/2.x/index.html" title="Struts 2.x Draft Docs">
-          <i class="none"></i>
-        Struts 2.x Draft Docs</a>
-            </li>
+                      <li>      <a href="../kickstart.html"  title="Kickstart FAQ">Kickstart FAQ</a>
+</li>
                   
-      <li>
-    
-                          <a href="../struts1eol-announcement.html" title="Struts 1.x EOL Announcement">
-          <i class="none"></i>
-        Struts 1.x EOL Announcement</a>
-            </li>
+                      <li>      <a href="../../release/2.3.x/index.html"  title="Struts 2.3.x">Struts 2.3.x</a>
+</li>
+                  
+                      <li>      <a href="../../release/1.3.x/index.html"  title="Struts 1.3.x">Struts 1.3.x</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">
-          <i class="none"></i>
-        How to Help FAQ</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">
-          <i class="none"></i>
-        Development Lists</a>
-            </li>
+                      <li>      <a href="../dev/dev-mail.html"  title="Development Lists">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/git-for-struts.html"  title="Git for Struts">Git for Struts</a>
+</li>
                   
-      <li class="active">
-    
-            <a href="#"><i class="none"></i>Release Guidelines</a>
-          </li>
+                      <li>      <a href="../dev/troubleshooting-git-svn.html"  title="Troubleshooting Git-Svn">Troubleshooting Git-Svn</a>
+</li>
                   
-      <li>
-    
-                          <a href="../dev/bylaws.html" title="PMC Charter">
-          <i class="none"></i>
-        PMC Charter</a>
-            </li>
+                      <li>      <a href="../dev/builds.html"  title="Source Code">Source Code</a>
+</li>
                   
-      <li>
-    
-                          <a href="../dev/minutes.html" title="Minutes">
-          <i class="none"></i>
-        Minutes</a>
-            </li>
+                      <li>      <a href="../dev/releases.html"  title="Release Guidelines">Release Guidelines</a>
+</li>
                   
-      <li>
-    
-                          <a href="../dev/volunteers.html" title="Volunteers">
-          <i class="none"></i>
-        Volunteers</a>
-            </li>
+                      <li>      <a href="../dev/bylaws.html"  title="PMC Charter">PMC Charter</a>
+</li>
                   
-      <li>
-    
-                          <a href="../../struts-sandbox/index.html" title="Sandbox">
-          <i class="none"></i>
-        Sandbox</a>
-            </li>
+                      <li>      <a href="../dev/volunteers.html"  title="Volunteers">Volunteers</a>
+</li>
                   
-      <li>
+                      <li>      <a href="http://svn.apache.org/viewvc/struts/"  title="Source Repository">Source Repository</a>
+</li>
+                          </ul>
+      </li>
+                  </ul>
+          
+          
+                                                              
+                   
+                      </div>
+          
+        </div>
+      </div>
+    </div>
     
-                          <a href="http://svn.apache.org/viewvc/struts/" class="externalLink" title="Source Repository">
-          <i class="none"></i>
-        Source Repository</a>
-            </li>
-            </ul>
+        <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: 2013-09-10</li>
+                      
                 
-          <hr class="divider" />
+                    
+      
+                            </ul>
+      </div>
 
-           <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" >
+        <div id="bodyColumn" >
                                   
             <!-- Copyright 1999-2006 The Apache Software Foundation
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -586,13 +472,12 @@ limitations under the License. --><!-- /
     
 
                   </div>
-            </div>
           </div>
 
     <hr/>
 
     <footer>
-            <div class="container-fluid">
+            <div class="container">
               <div class="row span12">Copyright &copy;                    2000-2013
                         <a href="http://www.apache.org/">The Apache Software Foundation</a>.
             All Rights Reserved.      
@@ -603,6 +488,11 @@ limitations under the License. --><!-- /
 <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>

Added: websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html
==============================================================================
--- websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html (added)
+++ websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html Tue Sep 10 12:01:49 2013
@@ -0,0 +1,238 @@
+<!DOCTYPE html>
+<!--
+ | Generated by Apache Maven Doxia at Sep 10, 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="20130910" />
+    <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="../../release/2.3.x/index.html"  title="Struts 2.3.x">Struts 2.3.x</a>
+</li>
+                  
+                      <li>      <a href="../../release/1.3.x/index.html"  title="Struts 1.3.x">Struts 1.3.x</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: 2013-09-10</li>
+                      
+                
+                    
+      
+                            </ul>
+      </div>
+
+      
+                
+        <div id="bodyColumn" >
+                                  
+            <h1>Troubleshooting Git-Svn</h1><div class="section"><h2>Git-Svn shows certificate errors<a name="Git-Svn_shows_certificate_errors"></a></h2><p>Most likely this is caused because you are having a SVN client v1.6 on your path. Please upgrade to SVN 1.7.</p></div><div class="section"><h2>Git-Svn exits with Code 6<a name="Git-Svn_exits_with_Code_6"></a></h2><p>To the date of this writing, Git-Svn is not compatible with SVN client v1.8. You most likely need to downgrade your client to v1.7.</p><p>If you are running MacPorts you can check if you have subversion 1.7 already installed with:</p>
+<div class="source"><pre class="prettyprint">port intalled
+</pre></div><p>If you have, you can activate it with:</p>
+<div class="source"><pre class="prettyprint">port activate subversion @1.7.10_1
+</pre></div><p>Please note, subversion 1.7 needs a specific depedency to be activated as well. Otherwise you will receive a dyld: Library not loaded: /opt/local/lib/libserf-1.0.dylib error. You can do this with:</p>
+<div class="source"><pre class="prettyprint">port activate serf1 @1.2.1_1
+</pre></div><p>If you have these version not installed on your system, youll need to a bit more work because MacPorts doesnt support installing older packages out of the box.</p><p>Youll need to manually checkout a specific revision of the portfiles. Please activate the latest subversion version you have and make sure it is running. Then:</p>
+<div class="source"><pre class="prettyprint"># checkout the revision with subversion 1.7 
+svn co -r 106653 http://svn.macports.org/repository/macports/trunk/dports/devel/subversion/
+cd subversion
+port install
+# Subversion 1.7 should install now
+cd ..
+rm -rf subversion
+</pre></div><p>Do the same with serf1:</p>
+<div class="source"><pre class="prettyprint"># checkout serf1 1.2.1_1
+svn co -r 108607 http://svn.macports.org/repository/macports/trunk/dports/www/serf1
+cd serf1
+port install
+# Serf1 1.2.1 should install now
+cd ..
+rm -rf serf1
+</pre></div><p>port install should now list the desired packages. Activate them.</p><p>Further reading:</p>
+<ul>
+  <li><a class="externalLink" href="http://www.philipp.haussleiter.de/2013/08/downgrading-subversion-from-1-8-to-1-7-in-macports/">Downgrading Subversion</a></li>
+  <li><a class="externalLink" href="https://trac.macports.org/wiki/howto/InstallingOlderPort">Installing older ports</a></li>
+</ul></div><div class="section"><h2>Git-Svn is not installed<a name="Git-Svn_is_not_installed"></a></h2><p>If you see:</p>
+<div class="source"><pre class="prettyprint"># git svn --version
+git: 'svn' is not a git command. See 'git --help'.
+</pre></div><p>On Macs running MacPort you can easily install it with:</p>
+<div class="source"><pre class="prettyprint">port install git-core +svn
+</pre></div><p>Make sure you have the +svn there, otherwise git will install without svn support. If that was your error, youll need to uninstall git-core and reinstall it again.</p><p>If you are seeing an error like this:</p>
+<div class="source"><pre class="prettyprint">Error: org.macports.activate for port python27 returned: Image error: /Applications/MacPorts/Python 2.7/Build Applet.app/Contents/Info.plist already exists and does not belong to a registered port.  Unable to activate port python27. Use 'port -f activate python27' to force the activation.
+</pre></div><p>It means you have already had a previous Python 2.7 installation running. This can happen if you have reinstalled MacPorts. Try to remove the folder. Please make a backup beforehand.</p></div>
+                  </div>
+          </div>
+
+    <hr/>
+
+    <footer>
+            <div class="container">
+              <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>
+                  
+                <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>



Mime
View raw message