Author: buildbot Date: Wed Sep 11 12:37:30 2013 New Revision: 878035 Log: Staging update by buildbot for struts
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/dev/builds.html websites/staging/struts/trunk/content/dev/bylaws.html websites/staging/struts/trunk/content/dev/dev-mail.html websites/staging/struts/trunk/content/dev/git-for-struts.html websites/staging/struts/trunk/content/dev/releases.html websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html websites/staging/struts/trunk/content/dev/volunteers.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 Sep 11 12:37:30 2013 @@ -1 +1 @@ -1521634 +1521820 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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements - 2002 and prior</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements - 2003</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements - 2004</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements - 2005</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Announcements</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <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" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/dev/builds.html ============================================================================== --- websites/staging/struts/trunk/content/dev/builds.html (original) +++ websites/staging/struts/trunk/content/dev/builds.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Source Code</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/dev/bylaws.html ============================================================================== --- websites/staging/struts/trunk/content/dev/bylaws.html (original) +++ websites/staging/struts/trunk/content/dev/bylaws.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Project Management Committee Charter</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> 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 Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Dev Mailing List</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/dev/git-for-struts.html ============================================================================== --- websites/staging/struts/trunk/content/dev/git-for-struts.html (original) +++ websites/staging/struts/trunk/content/dev/git-for-struts.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title></title> <link rel="stylesheet" href="../css/apache-maven-fluido-1.3.0.min.css" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> @@ -194,7 +194,7 @@ git config user.email # git config user.name <Your Name> # git config user.email <Your Email> -git svn init -s https://svn.apache.org/repos/asf/struts/struts2/ +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 @@ -202,7 +202,13 @@ git svn rebase <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> +</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 @@ -210,10 +216,8 @@ git svn rebase <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 g...@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> -<div class="source"><pre class="prettyprint">[https://github.com/apachestruts/struts2](https://github.com/apachestruts/struts2) -</pre></div><p>It is of course possible to add us as upstream repo:</p> -<div class="source"><pre class="prettyprint">git remote add upstream https://github.com/apachestruts/struts2 +</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 g...@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> @@ -222,6 +226,9 @@ git svn rebase <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> 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 Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Release Guidelines</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html ============================================================================== --- websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html (original) +++ websites/staging/struts/trunk/content/dev/troubleshooting-git-svn.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title></title> <link rel="stylesheet" href="../css/apache-maven-fluido-1.3.0.min.css" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/dev/volunteers.html ============================================================================== --- websites/staging/struts/trunk/content/dev/volunteers.html (original) +++ websites/staging/struts/trunk/content/dev/volunteers.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Volunteers</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/download.html ============================================================================== --- websites/staging/struts/trunk/content/download.html (original) +++ websites/staging/struts/trunk/content/download.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Download a Release</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Releases</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> FAQs</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/helping.html ============================================================================== --- websites/staging/struts/trunk/content/helping.html (original) +++ websites/staging/struts/trunk/content/helping.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <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" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Welcome to the Apache Struts project</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Javadoc Index</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title>Kickstart FAQ</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</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 Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Mailing Lists</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/primer.html ============================================================================== --- websites/staging/struts/trunk/content/primer.html (original) +++ websites/staging/struts/trunk/content/primer.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Key Technologies Primer</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/release-checklist.html ============================================================================== --- websites/staging/struts/trunk/content/release-checklist.html (original) +++ websites/staging/struts/trunk/content/release-checklist.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Release Checklist - Apache Struts Project</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/roadmap.html ============================================================================== --- websites/staging/struts/trunk/content/roadmap.html (original) +++ websites/staging/struts/trunk/content/roadmap.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title>Roadmap FAQ</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/security.html ============================================================================== --- websites/staging/struts/trunk/content/security.html (original) +++ websites/staging/struts/trunk/content/security.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title> Security Issues</title> @@ -164,7 +164,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/struts1eol-announcement.html ============================================================================== --- websites/staging/struts/trunk/content/struts1eol-announcement.html (original) +++ websites/staging/struts/trunk/content/struts1eol-announcement.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache Struts 1 EOL Announcement</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/struts1eol-press.html ============================================================================== --- websites/staging/struts/trunk/content/struts1eol-press.html (original) +++ websites/staging/struts/trunk/content/struts1eol-press.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache Struts 1 EOL Press Release</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li> Modified: websites/staging/struts/trunk/content/youatstruts.html ============================================================================== --- websites/staging/struts/trunk/content/youatstruts.html (original) +++ websites/staging/struts/trunk/content/youatstruts.html Wed Sep 11 12:37:30 2013 @@ -1,13 +1,13 @@ <!DOCTYPE html> <!-- - | Generated by Apache Maven Doxia at Sep 10, 2013 + | Generated by Apache Maven Doxia at Sep 11, 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 name="Date-Revision-yyyymmdd" content="20130911" /> <meta http-equiv="Content-Language" content="en" /> <title>You at Struts</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.3.0.min.css" /> @@ -163,7 +163,7 @@ <ul class="breadcrumb"> - <li id="publishDate">Last Published: 2013-09-10</li> + <li id="publishDate">Last Published: 2013-09-11</li>