You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/02/21 08:29:35 UTC
svn commit: r898745 [15/19] - in /websites/production/struts/content: ./
bootstrap/ bootstrap/css/ bootstrap/fonts/ bootstrap/js/ css/
development/2.x/ development/2.x/docs/
development/2.x/docs/sitegraph-plugin.thumbs/
development/2.x/struts2-core/api...
Added: websites/production/struts/content/git-for-struts.html
==============================================================================
--- websites/production/struts/content/git-for-struts.html (added)
+++ websites/production/struts/content/git-for-struts.html Fri Feb 21 07:29:33 2014
@@ -0,0 +1,195 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="UTF-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <meta name="Date-Revision-yyyymmdd" content="20140206"/>
+ <meta http-equiv="Content-Language" content="en"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+ <title>Git for Struts</title>
+
+ <link rel="stylesheet" href="/bootstrap/css/bootstrap.min.css">
+ <link rel="stylesheet" href="/css/main.css">
+
+ <script type="text/javascript" src="/js/jquery-1.11.0.min.js"></script>
+ <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
+ <script type="text/javascript" src="/js/community.js"></script>
+</head>
+<body>
+
+<a href="http://github.com/apache/struts">
+ <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>
+
+<header>
+ <!-- Fixed navbar -->
+<nav>
+ <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+ <div class="container">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Struts <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="index.html">Welcome</a></li>
+ <li><a href="downloads.html">Downloads</a></li>
+ <li><a href="announce.html">Announcements</a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li>
+ <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ </ul>
+ </li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Support <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="mail.html">User Mailing List</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li>
+ <li><a href="security.html">Reporting Security Issues</a></li>
+ </ul>
+ </li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="birdseye.html">Birds Eye</a></li>
+ <li><a href="primer.html">Key Technologies</a></li>
+ <li><a href="kickstart.html">Kickstart FAQ</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
+ <li><a href="http://struts.apache.org/release/2.3.x/index.html">Struts 2</a></li>
+ <li><a href="http://struts.apache.org/release/1.3.x/index.html">Struts 1</a></li>
+ </ul>
+ </li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Contributing <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="youatstruts.html">You at Struts</a></li>
+ <li><a href="helping.html">How to Help FAQ</a></li>
+ <li><a href="dev-mail.html">Development Lists</a></li>
+ <li class="divider"></li>
+ <li><a href="git-for-struts.html">Git for Struts</a></li>
+ <li><a href="builds.html">Source Code</a></li>
+ <li><a href="coding-standards.html">Coding standards</a></li>
+ <li class="divider"></li>
+ <li><a href="releases.html">Release Guidelines</a></li>
+ <li><a href="bylaws.html">PMC Charter</a></li>
+ <li><a href="volunteers.html">Volunteers</a></li>
+ <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li>
+ </ul>
+ </li>
+
+ </ul>
+ </div>
+ <!--/.nav-collapse -->
+ </div>
+ </div>
+</nav>
+
+ <div class="container">
+ <div class="row">
+ <div class="pull-left">
+ <a href="/" id="bannerLeft">
+ <img src="/img/struts.gif" alt="Apache Struts"/>
+ </a>
+ </div>
+ <div class="pull-right"><a href="http://www.apache.org" id="bannerRight">
+ <img src="/img/asf-logo.gif" alt="Apache Software Foundation"/>
+ </a>
+ </div>
+ </div>
+ </div>
+</header>
+
+
+<article class="container">
+ <section class="col-md-12">
+ <h1>Using Git with Struts</h1>
+
+<p>Struts uses Git and to manage the repository the git-flow was adopted, to read more about that please follow the links below:</p>
+
+<ul>
+<li>http://nvie.com/posts/a-successful-git-branching-model/</li>
+<li>https://github.com/nvie/gitflow</li>
+</ul>
+
+<p>First step is to install git-flow locally on your box, please follow the steps from this link</p>
+
+<p>https://github.com/nvie/gitflow/wiki/Installation</p>
+
+<p>Now you can clone Struts repository locally</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git clone https://git-wip-us.apache.org/repos/asf/struts.git
+</code></pre></div>
+<p>After cloning the repository locally you must initialize git-flow:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text"> git flow init -d
+</code></pre></div>
+<p>and done!</p>
+
+<p>Please remember that <code>master</code> branch cannot be modified directly from now on!</p>
+
+<h2>Contributing with GitHub</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 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 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 href="https://github.com/apache/struts">Apache Struts mirror on GitHub</a>:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git clone git@github.com:apache/struts.git struts-mirror.git
+</code></pre></div>
+<p>Please create an issue on our <a href="https://issues.apache.org/jira/browse/WW">issue tracker</a>.
+You'll 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>[https://github.com/apachestruts/struts]</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="highlight"><pre><code class="text language-text" data-lang="text">git remote add upstream git@github.com:apachestruts/struts
+</code></pre></div>
+<h2>Working with remote branches from GitHub</h2>
+
+<p>You can add a remote branch from GitHub like this:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git remote add opensourceio git@github.com:opensourceio/struts
+</code></pre></div>
+<p>Pull changes with:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git pull opensourceio anotherbranch
+</code></pre></div>
+<p>When merge conflicts happen, these can be resolved using:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git mergetool
+</code></pre></div>
+<p>After the merge, you need to commit the changes to Apache Git with:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git commit
+</code></pre></div>
+<h2>Further reading</h2>
+
+<ul>
+<li><a href="http://wiki.apache.org/general/GitAtApache">Git at Apache</a></li>
+</ul>
+
+ </section>
+</article>
+
+ <hr/>
+<footer class="container">
+ <div class="row col-md-12 text-center">
+ Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.
+ </div>
+ <div class="row col-md-12 text-center">
+ Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
+ project logos are trademarks of The Apache Software Foundation.
+ </div>
+</footer>
+
+
+</body>
+</html>
Modified: websites/production/struts/content/helping.html
==============================================================================
--- websites/production/struts/content/helping.html (original)
+++ websites/production/struts/content/helping.html Fri Feb 21 07:29:33 2014
@@ -1,927 +1,329 @@
<!DOCTYPE html>
-<!--
- | Generated by Apache Maven Doxia at Jan 15, 2014
- | Rendered using Apache Maven Fluido Skin 1.3.0
--->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <meta charset="UTF-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20140115" />
- <meta 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" />
- <link rel="stylesheet" href="./css/site.css" />
- <link rel="stylesheet" href="./css/print.css" media="print" />
-
-
- <script type="text/javascript" src="./js/apache-maven-fluido-1.3.0.min.js"></script>
-
-
- </head>
- <body class="topBarEnabled">
-
-
-
-
-
-
- <a href="http://github.com/apache/struts2">
- <img style="position: absolute; top: 0; right: 0; border: 0; z-index: 10000;"
- src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png"
- alt="Fork me on GitHub">
- </a>
-
-
-
-
-
- <div id="topbar" class="navbar navbar-fixed-top ">
- <div class="navbar-inner">
- <div class="container"><div class="nav-collapse">
-
-
- <ul class="nav">
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache Struts <b class="caret"></b></a>
- <ul class="dropdown-menu">
-
- <li> <a href="index.html" title="Welcome">Welcome</a>
-</li>
-
- <li> <a href="downloads.html" title="Downloads">Downloads</a>
-</li>
-
- <li> <a href="announce.html" title="Announcements">Announcements</a>
-</li>
-
- <li> <a href="http://www.apache.org/licenses/" title="License">License</a>
-</li>
-
- <li> <a href="http://apache.org/foundation/thanks.html" title="Thanks!">Thanks!</a>
-</li>
-
- <li> <a href="http://apache.org/foundation/sponsorship.html" title="Sponsorship">Sponsorship</a>
-</li>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Support <b class="caret"></b></a>
- <ul class="dropdown-menu">
-
- <li> <a href="mail.html" title="User Mailing List">User Mailing List</a>
-</li>
-
- <li> <a href="https://issues.apache.org/jira/browse/WW" title="Issue Tracker">Issue Tracker</a>
-</li>
-
- <li> <a href="security.html" title="Reporting Security Issues">Reporting Security Issues</a>
-</li>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation <b class="caret"></b></a>
- <ul class="dropdown-menu">
-
- <li> <a href="birdseye.html" title="Birds Eye">Birds Eye</a>
-</li>
-
- <li> <a href="primer.html" title="Key Technologies">Key Technologies</a>
-</li>
-
- <li> <a href="kickstart.html" title="Kickstart FAQ">Kickstart FAQ</a>
-</li>
-
- <li> <a href="https://cwiki.apache.org/confluence/display/WW/Home" title="Wiki">Wiki</a>
-</li>
-
- <li> <a href="../release/2.3.x/index.html" title="Struts 2">Struts 2</a>
-</li>
-
- <li> <a href="../release/1.3.x/index.html" title="Struts 1">Struts 1</a>
-</li>
- </ul>
- </li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Contributing <b class="caret"></b></a>
- <ul class="dropdown-menu">
-
- <li> <a href="youatstruts.html" title="You at Struts">You at Struts</a>
-</li>
-
- <li> <a href="helping.html" title="How to Help FAQ">How to Help FAQ</a>
-</li>
-
- <li> <a href="dev/dev-mail.html" title="Development Lists">Development Lists</a>
-</li>
-
- <li> <a href="dev/git-for-struts.html" title="Git for Struts">Git for Struts</a>
-</li>
-
- <li> <a href="dev/troubleshooting-git-svn.html" title="Troubleshooting Git-Svn">Troubleshooting Git-Svn</a>
-</li>
-
- <li> <a href="dev/builds.html" title="Source Code">Source Code</a>
-</li>
-
- <li> <a href="dev/releases.html" title="Release Guidelines">Release Guidelines</a>
-</li>
-
- <li> <a href="dev/bylaws.html" title="PMC Charter">PMC Charter</a>
-</li>
-
- <li> <a href="dev/volunteers.html" title="Volunteers">Volunteers</a>
-</li>
-
- <li> <a href="http://svn.apache.org/viewvc/struts/" title="Source Repository">Source Repository</a>
-</li>
- </ul>
- </li>
- </ul>
-
-
-
-
- </div>
-
- </div>
+<html>
+<head>
+ <meta charset="UTF-8"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+ <meta name="Date-Revision-yyyymmdd" content="20140206"/>
+ <meta http-equiv="Content-Language" content="en"/>
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+
+ <title>Helping</title>
+
+ <link rel="stylesheet" href="/bootstrap/css/bootstrap.min.css">
+ <link rel="stylesheet" href="/css/main.css">
+
+ <script type="text/javascript" src="/js/jquery-1.11.0.min.js"></script>
+ <script type="text/javascript" src="/bootstrap/js/bootstrap.js"></script>
+ <script type="text/javascript" src="/js/community.js"></script>
+</head>
+<body>
+
+<a href="http://github.com/apache/struts">
+ <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>
+
+<header>
+ <!-- Fixed navbar -->
+<nav>
+ <div class="navbar navbar-default navbar-fixed-top" role="navigation">
+ <div class="container">
+ <div class="navbar-collapse collapse">
+ <ul class="nav navbar-nav">
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Struts <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="index.html">Welcome</a></li>
+ <li><a href="downloads.html">Downloads</a></li>
+ <li><a href="announce.html">Announcements</a></li>
+ <li><a href="http://www.apache.org/licenses/">License</a></li>
+ <li><a href="http://apache.org/foundation/thanks.html">Thanks!</a></li>
+ <li><a href="http://apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+ </ul>
+ </li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Support <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="mail.html">User Mailing List</a></li>
+ <li><a href="https://issues.apache.org/jira/browse/WW">Issue Tracker</a></li>
+ <li><a href="security.html">Reporting Security Issues</a></li>
+ </ul>
+ </li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Documentation <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="birdseye.html">Birds Eye</a></li>
+ <li><a href="primer.html">Key Technologies</a></li>
+ <li><a href="kickstart.html">Kickstart FAQ</a></li>
+ <li><a href="https://cwiki.apache.org/confluence/display/WW/Home">Wiki</a></li>
+ <li><a href="http://struts.apache.org/release/2.3.x/index.html">Struts 2</a></li>
+ <li><a href="http://struts.apache.org/release/1.3.x/index.html">Struts 1</a></li>
+ </ul>
+ </li>
+
+ <li class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">Contributing <b class="caret"></b></a>
+ <ul class="dropdown-menu">
+ <li><a href="youatstruts.html">You at Struts</a></li>
+ <li><a href="helping.html">How to Help FAQ</a></li>
+ <li><a href="dev-mail.html">Development Lists</a></li>
+ <li class="divider"></li>
+ <li><a href="git-for-struts.html">Git for Struts</a></li>
+ <li><a href="builds.html">Source Code</a></li>
+ <li><a href="coding-standards.html">Coding standards</a></li>
+ <li class="divider"></li>
+ <li><a href="releases.html">Release Guidelines</a></li>
+ <li><a href="bylaws.html">PMC Charter</a></li>
+ <li><a href="volunteers.html">Volunteers</a></li>
+ <li><a href="https://git-wip-us.apache.org/repos/asf?p=struts.git">Source Repository</a></li>
+ </ul>
+ </li>
+
+ </ul>
</div>
+ <!--/.nav-collapse -->
</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>
+</nav>
+
+ <div class="container">
+ <div class="row">
+ <div class="pull-left">
+ <a href="/" id="bannerLeft">
+ <img src="/img/struts.gif" alt="Apache Struts"/>
+ </a>
</div>
- <div class="clear"><hr/></div>
+ <div class="pull-right"><a href="http://www.apache.org" id="bannerRight">
+ <img src="/img/asf-logo.gif" alt="Apache Software Foundation"/>
+ </a>
</div>
+ </div>
+ </div>
+</header>
- <div id="breadcrumbs">
- <ul class="breadcrumb">
-
-
- <li id="publishDate">Last Published: 2014-01-15</li>
-
-
-
-
- </ul>
- </div>
-
-
- <div id="bodyColumn" >
-
- <!-- $Id: helping.fml 1521447 2013-09-10 12:00:15Z grobmeier $
-Copyright 1999-2006 The Apache Software Foundation
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. --><!-- // ======================================================================== 78 --><!-- <part>
- <p align="center">
- "You can't always get what you want /
- <br/>
- but if you try real hard /
- <br/>
- you might just find /
- <br/>
- that you get what you need".
- <br/>
- [Rolling Stones]
- </p>
- </part> --><!-- <part>
-
- <p class="right">
- <strong>Next:</strong>
- <a href="mail.html">Mailing Lists</a>
- </p>
-
- </part> --><div class="section"><h2><a name="top">How to Help FAQ</a><a name="How_to_Help_FAQ"></a></h2><ol style="list-style-type: decimal"><li><a href="#corp">What can my company do to help support Apache
- Struts?</a></li><li><a href="#patches">How do I create a patch?</a></li><li><a href="#issues">How can I report defects or suggest features?</a></li><li><a href="#contribute">How can I contribute to the Struts source
- code?</a></li><li><a href="#documentation">How can I contribute to the
- documentation?</a></li><li><a href="#release">So when is the next release coming out?</a></li><li><a href="#release_help">What can I do to help the next release
- along?</a></li><li><a href="#decides_help">How can I help make the decisions?</a></li></ol></div><dl><dt><a name="corp">What can my company do to help support Apache
- Struts?</a></dt><dd>
- <p>
- Apache Struts is an all volunteer product.
- Our customers are the volunteers who donate their time and
- energy to
- supporting the product.
- If you want to support Apache Struts, and become one of our
- customers,
- then you need to get involved and become a volunteer.
- </p>
-
- <p>
- Our challenge to any team using an Apache Struts product
- is to donate the time of one team member
- one afternoon a week (or more if you can spare the
- resources).
- Have your team member browse
- <a href="#issues">JIRA</a>
- for any issues
- without a
- <a href="#patches">patch</a>
- or unit test,
- and
- <a href="#contribute">add the patch or test.</a>
- (Please note that we do not use @author tags in our
- JavaDocs an documentation.)
- If your patch includes an @author tag, we would have to
- ask that it be removed.
- </p>
-
- <p>
- If an Apache Struts product doesn't do what
- <i>you</i>
- want,
- it's up to
- <b>you</b>
- to step up and propose the patch.
- If an Apache Struts product doesn't ship as often as you
- would like,
- it's up to you to step up with the tests and fixes that
- get a release out
- the door.
- <a class="externalLink" href="http://jakarta.apache.org/site/contributing.html">
- (Like Craig
- McClanahan did for Tomcat.)</a>
- </p>
-
- <p>
- If Struts does do what you want, help others become
- involved by turning your
- war stories into FAQs and how-tos that we can make part of
- the
- <a href="#documentation">documentation.</a>
- The mailing list is very active and
- trundling through the archives is no picnic.
- We can always use volunteers who can reduce the best
- threads
- to coherent articles we can share with others.
- </p>
-
- <p>
- We don't sell Struts for money, but anyone who wants to be
- our customer
- can pay us back by donating the time and energy that money
- represents.
- </p>
-
- <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="patches">How do I create a patch?</a></dt><dd>
- <p>
- A patch is a machine-readable script that can
- automatically
- recreate a change to a text file, including source code
- and
- documentation.
- The patch format is also human-readable.
- Developers often pass patches around to discuss a change
- before
- applying it to the main repository.
- </p>
-
- <p>
- The best way to affect a change to the source code or
- documentation
- is to provide a patch.
- Apache Struts committers can then review your patch and
- decide
- whether to apply it to the main repository.
- </p>
-
- <p>
- Please be aware that the Struts project follows general coding
- conventions. In short, these are the official Java coding conventions
- plus the rule to favor spaces over tabs for indenting. See more
- details at <a class="externalLink" href="https://cwiki.apache.org/confluence/display/S2WIKI/Struts+2+Coding+Conventions">
- Struts 2 Coding Conventions (Wiki)</a>
- </p>
-
- <p>
- To create a patch, you first have to
- <a href="downloads.html#Source_Code">
- checkout</a>
- a copy of the source code or documentation from the main
- repository.
- You can then change your copy, and create the patch using
- a simple
- <a class="externalLink" href="http://subversion.org/">Subversion</a>
- command, like this:
- </p>
-
- <p>
- <tt>svn diff Main.java >> patchfile.txt</tt>
- </p>
-
- <p>
- Then, create a
- <a href="#issues">JIRA
- issue</a>
- about the change, and attach the patch file.
- </p>
-
- <p>
- Some Apache projects ask that you to submit your patch to
- the mailing
- list.
- We would prefer that you create a
- JIRA issue and then attach the patch to the issue.
- To do this, you must first create the issue,
- and then modify the report to add your patch.
- We realize this is a bit clumsy, but it keeps us from
- losing things,
- and helps to ensure that your patch will be attended.
- </p>
-
- <p>
- The
- <a class="externalLink" href="http://www.netbeans.org/community/contribute/patches.html">
- NetBeans community</a>
- also has a helpful section on the
- subject of creating patches.
- </p>
-
- <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="issues">How can I report defects or suggest features?</a></dt><dd>
- <p>
- Tracking of defect reports and enhancement suggestions for
- Apache Struts
- products is handled
- through the
- <a class="externalLink" href="https://issues.apache.org/jira/browse/WW">Apache Struts
- JIRA instance.</a>
- Please select the appropriate Apache Struts product from
- the list,
- and then select the component to which you feel this report
- relates.
- You will automatically be notified by email as the status
- of your defect or
- enhancement report changes.
- Please be sure to read
- <a class="externalLink" href="http://www.chiark.greenend.org.uk/~sgtatham/bugs.html">
- How to
- Report Bugs Effectively</a>
- before posting a report.
- </p>
-
- <p>
- If you can't write a
- <a href="#patches">patch</a>
- to address your issue,
- a unit test that demonstrates the problem is also welcome.
- (And, of course, unit tests that prove your patch works
- are equally welcome.)
- </p>
-
- <p>
- If the defect or feature is already being tracked,
- you can vote for the issue and call more attention to it.
- Each user can cast up to six votes at a time.
- </p>
-
- <p>
- If there is a patch attached to the issue, you can also
- try applying
- to your local copy of Struts, and report whether it worked
- for you.
- Feedback from developers regarding a proposed patch is
- really quite
- helpful.
- Don't hesitate to add a "works for me" note to a ticket
- if you've tried the patch yourself and found it useful.
- </p>
-
- <p>
- Feature suggestions are also maintained in the
- <a class="externalLink" href="https://issues.apache.org/jira/browse/WW">JIRA issue
- tracker.</a>
- </p>
-<!-- <p>
- For your convenience, here are some common queries:
- </p>
-
- <ul>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Struts&order=bugs.bug_id">
- Open reports</a>
- </li>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=3&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Struts&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=Bug+Number">
- Open reports with at least 3 votes</a>
- </li>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=Blocker&bug_severity=Critical&bug_severity=Major&bug_severity=Normal&bug_severity=Minor&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Struts&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&order=bugs.bug_id">
- Open problem reports</a>
- <ul>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Struts&bug_severity=Blocker&bug_severity=Critical&bug_severity=Major&order=bugs.bug_id">
- major problem reports</a>
- </li>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Struts&bug_severity=Blocker&bug_severity=Normal&bug_severity=Minor&order=bugs.bug_id">
- normal/minor problem reports</a>
- </li>
- </ul>
- </li>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&product=Struts&bug_severity=Enhancement&order=Bug+Number">
- Open enhancement reports</a>
- <ul>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_severity=Enhancement&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&bugidtype=include&bug_id=&changedin=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&product=Struts&short_desc=&short_desc_type=allwordssubstr&long_desc=&long_desc_type=allwordssubstr&bug_file_loc=&bug_file_loc_type=allwordssubstr&keywords=PatchAvailable&keywords_type=anywords&field0-0-0=noop&type0-0-0=noop&value0-0-0=&cmdtype=doit&newqueryname=&order=Bug+Number">
- Patch Available</a>
- </li>
- </ul>
- </li>
- <li>
- <a href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=RESOLVED&resolution=LATER&resolution=REMIND&product=Struts&order=bugs.bug_id">
- Reports to be handled "LATER"</a>
- </li>
- </ul> -->
- <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="contribute">How can I contribute to the Struts source
- code?</a></dt><dd>
-
- <p>
- A very good place to start is by
- <b>reviewing the list of open issues</b>
- and pending feature suggestions in the
- <a href="#issues">issue tracker.</a>
- If you see an issue that needs a patch you can write,
- feel free to annex your patch.
- If you see an issue that needs a unit test to prove it's
- fixed,
- feel free to annex your test case.
- If someone has posted a patch to an issue you'd like to
- see resolved,
- apply the patch to your local development copy of Struts.
- Then let us know if it works for you, and if it does,
- cast your vote for the issue and its patch.
- </p>
-
- <p>
- If none of the pending issues scratch your itch,
- another good place to start is by
- <b>contributing unit tests</b>
- for existing features (even those that still work).
- </p>
-
- <p>
- You can upload a proposed
- <a href="#patches">patch</a>
- to either the code or documentation by creating a feature
- suggestion
- in the
- <a href="#issues">issue tracker.</a>
- <b>After creating the ticket.</b>
- you can go back and upload a
- file containing your patch.
- </p>
-
- <p>
- Our current approach to
- <a href="kickstart.html#tests">unit testing</a>
- works fairly well for exercising most method-level stuff,
- but does
- not really address situations of dynamic behavior -- most
- particularly the
- execution of custom tags for Struts.
- You can try to fake what a JSP container does, but a much
- more reliable
- testing regime would actually execute the tag in a real
- container.
- For that purpose, we use the
- <a class="externalLink" href="http://jakarta.apache.org/cactus">Cactus</a>
- testing framework,
- which re-executes the JUnit-based tests as well to make
- sure that nothing
- bad happens when you switch environments.
- Right now, there are very few dynamic tests; ideally, we
- will have tests
- for every tag, that cover every reasonable combination of
- tag attribute
- values (yes, that's a tall order -- the totally lines of
- test source code
- will undoubtedly exceed the totally lines of code in the
- framework itself
- if we achieve this).
- </p>
-
- <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="documentation">How can I contribute to the
- documentation?</a></dt><dd>
-
- <p>
- The Struts 2 documentation is maintained using the
- Atlassian Confluence wiki software and automatically exported to HTML
- for viewing on the website.
- To help with the Struts 2 documentation,
- you must create an account at
- <a class="externalLink" href="http://cwiki.apache.org/confluence">cwki.apache.org/confluence</a>,
- AND you must file a
- <a class="externalLink" href="http://apache.org/licenses/icla.txt">Contributor License Agreement</a>
- with the ASF.
- </p>
- <p>
- Other ways to help out with the documentation is to
- just leave a comment on a page that needs fixing.
- If you have a cwiki Confluence account,
- you can also create pages on the
- <a class="externalLink" href="http://cwiki.apache.org/S2WIKI/home.html">Struts 2 Wiki</a>
- without filing a CLA.
- </p>
- <p>
- The Struts 1 documentation is maintained in the repository
- under
- the
- <tt>xdocs</tt>
- folder for the subproject.
- To build just the documentation for a subproject,
- change to the subprojects trunk directory and run
- <tt>maven site</tt>. .
- The Maven build compiles the site and stores the
- output
- under
- <tt>target/docs/</tt>.
- See <a class="externalLink" href="http://wiki.apache.org/struts/StrutsMaintenanceWebsite">
- Struts Maintenance Website</a> for details.
- </p>
- <p>
- Procedurally, the only difference between patching
- the Struts 1 documentation and
- software is that the docs are kept in XML rather than
- Java
- source code.
- Otherwise, all the same instructions pertain.
- </p>
-
- <p>
- If you would like to help with the documentation, it
- is
- important to
- provide patches and new pages in the XML source.
- Otherwise, some other volunteer will have to do this
- for
- you, and it may
- never get done.
- (Sad but true.)
- </p>
-
- <p>
- If you are submitting new material, it is important to
- decide exactly
- where you would put this in relation to the rest of
- the
- documentation.
- Again, someone has to figure that out before it can be
- added,
- and that someone might as well be you.
- </p>
-
- <p>
- If you are making a substantial contribution, such as
- a
- new HOW-TO,
- please consider submitting a document in the XML
- format we
- use.
- This will make it easier to add your contribution to
- the
- official
- documentation so that it becomes part of a Struts
- distribution.
- </p>
-
- <p>
- The trick to getting started is to download the
- nightly
- build and try
- building the subproject's site.
- Then try adding your own XML page under xdocs/ to see
- if
- the build succeeds.
- If it doesn't, it will report where the bad element
- is,
- much like it reports
- where a bad programming expression is.
- If it does, then your page should be available under
- target/site/
- </p>
-
-<!-- <p>
- To display markup, substitute &lt; for <.
- The unmatched trailing > will be ignored.
- Since it is XML, all elements also need to closed.
- So elements like <br> and <hr> need to set out
- as
- <br/> and <hr/>.
- </p>
- <p>
- Also watch for the length of code samples - these do
- not
- wrap.
- If a line is too long,
- it will force the right margin out past the edge of
- the
- screen or
- printed page.
- </p> -->
-
- <p>
- You can also post documentation to the
- <a class="externalLink" href="http://wiki.apache.org/struts/">Apache Struts wiki.</a>
- </p>
- <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="release">So when is the next release coming out?</a></dt><dd>
-
- <p>
- Here is the truth regarding releases:
- </p>
-
- <p>
- Apache products are released on the basis of merit,
- and ~not~ according to a strict timetable.
- The volunteers devote whatever time they can to work
- on
- the product.
- But all volunteers have real jobs and real lives, that
- do
- take precedence.
- Since Struts does not have paid personnel working on
- the
- project,
- we simply cannot make date-oriented commitments.
- </p>
-
- <p>
- The bottom line is that Apache takes releases very
- seriously.
- We do not compromise the quality of our software by
- watching the calendar
- (and then ship something ready or not).
- A release is ready when it is ready.
- </p>
-
- <p>
- That may sound flip, but it ~is~ the truth.
- The delivery of production-quality, leading-edge
- software
- is
- not something anyone can prognosticate.
- If anyone tries, they are lying to you.
- That, we won't do ;-)
- </p>
-
- <p>
- What we ~will~ do is release all of our development
- software as soon as
- it is developed.
- This way you can judge for yourself how quickly the
- development is
- proceeding, and whether what is being developed will
- meet
- your needs.
- If you need a feature right now, you can use the
- nightly
- build, or roll
- your own patch.
- There are no internal code repositories, private
- development lists,
- secret chat rooms, or conference calls.
- What you see is what we got.
- If you are following the DEV list, then you know
- everything the
- developers know.
- Really, you do.
- </p>
-
- <p>
- <i>So, what do you tell your team?</i>
- If you can ship your application based on the nightly
- build of your choice,
- then consider that an option.
- You can still ship yours, even if we don't ship ours,
- and you will have access to all the latest patches or
- enhancements.
- (Just like we were working down the hall.)
- If you can only ship your application based on a
- release
- build of Struts,
- then you should base your development on the release
- build
- of Struts,
- and keep an eye on what is coming down the pipeline.
- This way you are at least forewarned and forearmed.
- </p>
-
- <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="release_help">What can I do to help the next release
- along?</a></dt><dd>
-
- <ul>
- <li>
- Most importantly, download the latest
- <a href="dev/builds.html#NightlyBuilds">nightly build</a>
- or development release
- and test it against your own applications.
- Report any and all issues or suspected issues to
- <a href="#issues">
- the issue tracker.</a>
- The sooner we resolve any problems, the fewer
- betas or
- release candidates
- we will have to distribute before we are done.
- (How do we know when we're done? -- When we run
- out of
- issues =:o)
- The sooner we find them, the sooner we are done.)
- </li>
-
- <li>
- <b>Contribute
- <a href="kickstart.html#tests">unit tests.</a>
- </b>
- The closer we get to a release, the more we worry
- about breaking something.
- The more tests we have, the more confident we can
- be
- when applying patches.
- Tests that prove that a pending issue is actually
- a
- defect are the most
- welcome ones.
- But we are eager for any and all tests for any and
- all
- features,
- even those that still work =:0).
- </li>
-
- <li>
- <b>Review the list of issues</b>
- at
- <a href="#issues">the issue tracker.</a>
- If there are any to which you can respond, please
- do.
- If there any patches posted, feel free to test
- them
- your system,
- report the results, and cast your vote if they
- work.
- </li>
-
- <li>
- <b>Confirm an issue's category and
- status.</b>
- Newbies often post feature suggestions or
- help-desk
- questions as "bugs".
- This bloats the list of fixes we (apparently) need
- to
- apply before the next
- beta, making it hard to see the forest for the
- trees.
- If an issue doesn't seem to be categorized
- correctly,
- exercise your best judgment and change it.
- If one ticket seems like a duplicate of another,
- go ahead and enter the change.
- Every modification to the ticket is echoed to the
- DEV
- list and
- automatically subjected to peer review.
- Err on the side of doing.
- </li>
-
- <li>
- Use the issue tracker to
- <b>vote for issues</b>
- you feel should be handled first.
- If an issue on your ballot doesn't include a
- patch,
- feel free to try coding one yourself.
- (In a meritocracy, patches are the only votes that
- matter.)
- Dozens of developers have contributed code or
- documentation to Struts.
- You can too =:0)
- </li>
-
- <li>
- <b>Answer questions on the user
- list.</b>
- The Committers only have a limited amount of time
- to
- volunteer.
- If Developers are supporting each other on the
- lists,
- the Committers have more time to spend on the next
- release.
- </li>
- </ul>
-
- <p align="right"><a href="#top">[top]</a></p><hr /></dd><dt><a name="decides_help">How can I help make the decisions?</a></dt><dd>
-
- <p>
- A guiding principle of the Apache Software Foundation is
- "them that do the work, make the decisions".
- This phrase is actually a double-entendre.
- A project will make some decisions by voting (very few),
- but the real decisions are made when a volunteer actually
- does the
- work.
- Unless someone volunteers to do the work,
- other decisions are meaningless.
- </p>
-
- <p>
- In an ASF project, like Apache Struts,
- volunteers who make sustained contributions to the project
- are invited to become "Committers".
- In due course, Committers are invited to join the Project
- Management
- Committee (PMC).
- A goal of the ASF is for all Committers to be on the PMC.
- </p>
-
- <p>
- By "sustained", we mean that an individual has been active
- in the project for at least six months.
- The contributions should come in the form of both patches
- (to code or documentation), and posts to the mailing
- lists.
- Patches must be competent and accepted into the
- repository.
- Posts must be consistently helpful, friendly, and
- collaborative.
- The most important characteristic in a prospective
- Committer is an
- amicable demeanor that fosters goodwill.
- </p>
-
- <p>
- As PMC members take note of Struts developers who meet our
- qualifications, one of us will call for a vote on the
- internal
- PMC mailing list.
- (This usually happens when someone gets tired of applying
- the volunteer's patches!)
- The internal list is rarely used, and it is never used for
- development discussions.
- If the PMC vote passes, we will send the developer a
- invitation
- privately, to give the individual a chance to accept or
- discretely
- decline.
- If the candidate is able to accept,
- the PMC will announce the new member on the dev list.
- </p>
-
- <p>
- For more about decision-making, see
- <a class="externalLink" href="http://apache.org/foundation/how-it-works.html">
- "How the ASF Works"</a>
- and the
- <a href="dev/bylaws.html">Apache Struts Charter.</a>
- For more about project infrastructure,
- see "Project Maintenance and Resources" in the
- <a class="externalLink" href="http://wiki.apache.org/struts/">Struts 1
- wiki.</a>
- </p>
-
- <p align="right"><a href="#top">[top]</a></p></dd></dl>
- </div>
- </div>
-
- <hr/>
-
- <footer>
- <div class="container">
- <div class="row span12">Copyright © 2000-2014
- <a href="http://www.apache.org/">The Apache Software Foundation</a>.
- All Rights Reserved.
-
- </div>
+<article class="container">
+ <section class="col-md-12">
+ <h1>How to Help FAQ</h1>
+
+<ul>
+<li><h3>What can my company do to help support Apache Struts?</h3>
+
+<p>Apache Struts is an all volunteer product. Our customers are the volunteers who donate their time and
+energy to supporting the product. If you want to support Apache Struts, and become one of our
+customers, then you need to get involved and become a volunteer.</p>
+
+<p>Our challenge to any team using an Apache Struts product is to donate the time of one team member
+one afternoon a week (or more if you can spare the resources).
+Have your team member browse <a href="#issues">JIRA</a> for any issues without a <a href="#patches">patch</a> or unit test,
+and <a href="#contribute">add the patch or test</a>. (Please note that we do not use @author tags in our
+JavaDocs an documentation.)
+If your patch includes an @author tag, we would have to ask that it be removed.</p>
+
+<p>If an Apache Struts product doesn't do what <em>you</em> want, it's up to <strong>you</strong> to step up and propose the patch.
+If an Apache Struts product doesn't ship as often as you would like, it's up to you to step up with
+the tests and fixes that get a release out the door.
+<a href="http://jakarta.apache.org/site/contributing.html">(Like Craig McClanahan did for Tomcat)</a>.</p>
+
+<p>If Struts does do what you want, help others become involved by turning your war stories into FAQs
+and how-tos that we can make part of the <a href="#documentation">documentation</a>.
+The mailing list is very active and trundling through the archives is no picnic. We can always use
+volunteers who can reduce the best threads to coherent articles we can share with others.</p>
+
+<p>We don't sell Struts for money, but anyone who wants to be our customer can pay us back by donating
+the time and energy that money represents.</p></li>
+<li><h3><a name="patches"></a>How do I create a patch?</h3>
+
+<p>A patch is a machine-readable script that can automatically recreate a change to a text file,
+including source code and documentation. The patch format is also human-readable. Developers often pass
+patches around to discuss a change before applying it to the main repository.</p>
+
+<p>The best way to affect a change to the source code or documentation is to provide a patch.
+Apache Struts committers can then review your patch and decide whether to apply it to the main repository.</p>
+
+<p>Please be aware that the Struts project follows general coding conventions. In short, these are
+the official Java coding conventions plus the rule to favor spaces over tabs for indenting. See more
+details at <a href="https://cwiki.apache.org/confluence/display/S2WIKI/Struts+2+Coding+Conventions">Struts 2 Coding Conventions (Wiki)</a></p>
+
+<p>To create a patch, you first have to <a href="git-for-struts.html">checkout</a> a copy of the source code
+or documentation from the main repository. You can then change your copy, and create the patch using a simple
+<a href="http://git-scm.com/">Git</a> command, like this:</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git diff Main.java >> patchfile.txt
+</code></pre></div>
+<p>Then, create a <a href="#issues">JIRA issue</a>about the change, and attach the patch file.</p>
+
+<p>Some Apache projects ask that you to submit your patch to the mailing list. We would prefer that you
+create a JIRA issue and then attach the patch to the issue. To do this, you must first create the issue,
+and then modify the report to add your patch. We realize this is a bit clumsy, but it keeps us from
+losing things, and helps to ensure that your patch will be attended.</p>
+
+<p>The <a href="http://www.netbeans.org/community/contribute/patches.html">NetBeans community</a> also has a helpful section on the
+subject of creating patches.</p></li>
+<li><h3><a name="issues"></a>How can I report defects or suggest features?</h3>
+
+<p>Tracking of defect reports and enhancement suggestions for Apache Struts products is handled through the
+<a href="https://issues.apache.org/jira/browse/WW">Apache Struts JIRA instance</a>.
+Please select the appropriate Apache Struts product from the list, and then select the component to which
+you feel this report relates. You will automatically be notified by email as the status of your defect or
+enhancement report changes. Please be sure to read
+<a href="http://www.chiark.greenend.org.uk/%7Esgtatham/bugs.html">How to Report Bugs Effectively</a>
+before posting a report.</p>
+
+<p>If you can't write a <a href="#patches">patch</a> to address your issue, a unit test that demonstrates the problem is also welcome.
+(And, of course, unit tests that prove your patch works are equally welcome.)</p>
+
+<p>If the defect or feature is already being tracked, you can vote for the issue and call more attention to it.
+Each user can cast up to six votes at a time.</p>
+
+<p>If there is a patch attached to the issue, you can also try applying to your local copy of Struts,
+and report whether it worked for you. Feedback from developers regarding a proposed patch is really quite
+helpful.
+Don't hesitate to add a "works for me" note to a ticket if you've tried the patch yourself and found it useful.</p>
+
+<p>Feature suggestions are also maintained in the <a href="https://issues.apache.org/jira/browse/WW">JIRA issue tracker</a>.</p></li>
+<li><h3><a name="contribute"></a>How can I contribute to the Struts source code?</h3>
+
+<p>A very good place to start is by <strong>reviewing the list of open issues</strong> and pending feature suggestions in the
+<a href="#issues">issue tracker</a>.
+If you see an issue that needs a patch you can write, feel free to annex your patch. If you see an issue
+that needs a unit test to prove it's fixed, feel free to annex your test case.
+If someone has posted a patch to an issue you'd like to see resolved, apply the patch to your local development
+copy of Struts.
+Then let us know if it works for you, and if it does, cast your vote for the issue and its patch.</p>
+
+<p>If none of the pending issues scratch your itch, another good place to start is by <strong>contributing unit tests</strong>
+for existing features (even those that still work).</p>
+
+<p>You can upload a proposed <a href="#patches">patch</a> to either the code or documentation by creating a feature
+suggestion in the <a href="#issues">issue tracker</a>.
+<strong>After creating the ticket</strong> you can go back and upload a file containing your patch.</p>
+
+<p>Our current approach to <a href="kickstart.html#tests">unit testing</a> works fairly well for exercising most method-level
+stuff, but does not really address situations of dynamic behavior -- most particularly the execution of custom tags
+for Struts.
+You can try to fake what a JSP container does, but a much more reliable testing regime would actually execute
+the tag in a real container.</p></li>
+<li><h3><a name="documentation"></a>How can I contribute to the documentation?</h3>
+
+<p>The Struts 2 documentation is maintained using the Atlassian Confluence wiki software and automatically
+exported to HTML for viewing on the website. To help with the Struts 2 documentation, you must create
+an account at <a href="http://cwiki.apache.org/confluence">cwki.apache.org/confluence</a>, AND you must file a
+<a href="http://apache.org/licenses/icla.txt">Contributor License Agreement</a> with the ASF.</p>
+
+<p>Other ways to help out with the documentation is to just leave a comment on a page that needs fixing.
+If you have a cwiki Confluence account, you can also create pages on the
+<a href="http://cwiki.apache.org/S2WIKI/home.html">Struts 2 Wiki</a> without filing a CLA.</p>
+
+<p>If you are submitting new material, it is important to decide exactly where you would put this
+in relation to the rest of the documentation.
+Again, someone has to figure that out before it can be added, and that someone might as well be you.</p></li>
+<li><h3><a name="release"></a>So when is the next release coming out?</h3>
+
+<p>Here is the truth regarding releases:</p>
+
+<p>Apache products are released on the basis of merit, and ~not~ according to a strict timetable.
+The volunteers devote whatever time they can to work on the product. But all volunteers have real jobs
+and real lives, that do take precedence. Since Struts does not have paid personnel working on the project,
+we simply cannot make date-oriented commitments.</p>
+
+<p>The bottom line is that Apache takes releases very seriously. We do not compromise the quality of our software by
+watching the calendar (and then ship something ready or not). A release is ready when it is ready.</p>
+
+<p>That may sound flip, but it ~is~ the truth. The delivery of production-quality, leading-edge software
+is not something anyone can prognosticate. If anyone tries, they are lying to you.
+That, we won't do ;-)</p>
+
+<p>What we ~will~ do is release all of our development software as soon as it is developed.
+This way you can judge for yourself how quickly the development is proceeding, and whether what is being
+developed will meet your needs.
+If you need a feature right now, you can use the nightly build, or roll your own patch. There are no internal
+code repositories, private development lists, secret chat rooms, or conference calls.
+What you see is what we got. If you are following the DEV list, then you know everything the developers know.
+Really, you do.</p>
+
+<p><em>So, what do you tell your team</em>?
+If you can ship your application based on the nightly build of your choice, then consider that an option.
+You can still ship yours, even if we don't ship ours, and you will have access to all the latest patches or
+enhancements. (Just like we were working down the hall.) If you can only ship your application based on a release
+build of Struts, then you should base your development on the release build of Struts,
+and keep an eye on what is coming down the pipeline.
+This way you are at least forewarned and forearmed.</p></li>
+<li><h3><a name="release_help"></a>What can I do to help the next release along?</h3>
+
+<ul>
+<li>Most importantly, download the latest <a href="builds.html#NightlyBuilds">nightly build</a> or development release
+and test it against your own applications. Report any and all issues or suspected issues to
+<a href="#issues">the issue tracker</a>.
+The sooner we resolve any problems, the fewer betas or release candidates we will have to distribute before we are done.
+(How do we know when we're done? -- When we run out of issues =:o) The sooner we find them, the sooner we are done.)</li>
+<li><strong>Contribute <a href="kickstart.html#tests">unit tests</a></strong>. The closer we get to a release, the more we worry
+about breaking something. The more tests we have, the more confident we can be when applying patches.
+Tests that prove that a pending issue is actually a defect are the most welcome ones.
+But we are eager for any and all tests for any and all features, even those that still work =:0).</li>
+<li><strong>Review the list of issues</strong> at <a href="#issues">the issue tracker</a>. If there are any to which you can respond, please
+do. If there any patches posted, feel free to test them your system, report the results, and cast your vote
+if they work.</li>
+<li><em>Confirm an issue's category and status</em>. Newbies often post feature suggestions or help-desk
+questions as "bugs". This bloats the list of fixes we (apparently) need to apply before the next
+beta, making it hard to see the forest for the trees.
+If an issue doesn't seem to be categorized correctly, exercise your best judgment and change it.
+If one ticket seems like a duplicate of another, go ahead and enter the change.
+Every modification to the ticket is echoed to the DEV list and automatically subjected to peer review.
+Err on the side of doing.</li>
+<li>Use the issue tracker to <strong>vote for issues</strong> you feel should be handled first. If an issue on your
+ballot doesn't include a patch, feel free to try coding one yourself. (In a meritocracy, patches are
+the only votes that matter.)
+Dozens of developers have contributed code or documentation to Struts. You can too =:0)</li>
+<li><strong>Answer questions on the user list</strong>. The Committers only have a limited amount of time to volunteer.
+If Developers are supporting each other on the lists, the Committers have more time to spend on the next
+release.</li>
+</ul></li>
+<li><h3><a name="decides_help"></a>How can I help make the decisions?</h3>
+
+<p>A guiding principle of the Apache Software Foundation is "them that do the work, make the decisions".
+This phrase is actually a double-entendre. A project will make some decisions by voting (very few),
+but the real decisions are made when a volunteer actually does the work. Unless someone volunteers to do the work,
+other decisions are meaningless.</p>
+
+<p>In an ASF project, like Apache Struts, volunteers who make sustained contributions to the project
+are invited to become "Committers". In due course, Committers are invited to join the Project Management
+Committee (PMC).
+A goal of the ASF is for all Committers to be on the PMC.</p>
+
+<p>By "sustained", we mean that an individual has been active in the project for at least six months.
+The contributions should come in the form of both patches (to code or documentation), and posts to the mailing
+lists. Patches must be competent and accepted into the repository. Posts must be consistently helpful, friendly,
+and collaborative. The most important characteristic in a prospective Committer is an
+amicable demeanor that fosters goodwill.</p>
+
+<p>As PMC members take note of Struts developers who meet our qualifications, one of us will call for a vote on
+the internal PMC mailing list. (This usually happens when someone gets tired of applying
+the volunteer's patches!) The internal list is rarely used, and it is never used for development discussions.
+If the PMC vote passes, we will send the developer a invitation privately, to give the individual a chance to accept
+or discretely decline.
+If the candidate is able to accept, the PMC will announce the new member on the dev list.</p>
+
+<p>For more about decision-making, see <a href="http://apache.org/foundation/how-it-works.html">How the ASF Works</a>
+and the <a href="bylaws.html">Apache Struts Charter</a>. For more about project infrastructure,
+see "Project Maintenance and Resources" in the <a href="http://wiki.apache.org/struts/">Struts 1 wiki</a>.</p></li>
+</ul>
+
+ </section>
+</article>
+
+ <hr/>
+<footer class="container">
+ <div class="row col-md-12 text-center">
+ Copyright © 2000-2014 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.
+ </div>
+ <div class="row col-md-12 text-center">
+ Apache Struts, Struts, Apache, the Apache feather logo, and the Apache Struts
+ project logos are trademarks of The Apache Software Foundation.
+ </div>
+</footer>
- <?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>
+
+</body>
</html>
Added: websites/production/struts/content/img/asf-logo.gif
==============================================================================
Binary file - no diff available.
Propchange: websites/production/struts/content/img/asf-logo.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: websites/production/struts/content/img/struts.gif
==============================================================================
Binary file - no diff available.
Propchange: websites/production/struts/content/img/struts.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream