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/05/21 09:40:01 UTC
svn commit: r1596503 - in /struts/site/trunk/content: git-for-struts.html
submitting-patches.html
Author: lukaszlenart
Date: Wed May 21 07:40:01 2014
New Revision: 1596503
URL: http://svn.apache.org/r1596503
Log:
Renames file to match its meaning
Added:
struts/site/trunk/content/submitting-patches.html
Removed:
struts/site/trunk/content/git-for-struts.html
Added: struts/site/trunk/content/submitting-patches.html
URL: http://svn.apache.org/viewvc/struts/site/trunk/content/submitting-patches.html?rev=1596503&view=auto
==============================================================================
--- struts/site/trunk/content/submitting-patches.html (added)
+++ struts/site/trunk/content/submitting-patches.html Wed May 21 07:40:01 2014
@@ -0,0 +1,199 @@
+<!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>Submitting patches</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="submitting-patches.html">Submitting patches</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>Submitting patches</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>Non-committers</h2>
+
+<p>If you aren't a committer you must use this link below or mirror at GitHub</p>
+<div class="highlight"><pre><code class="text language-text" data-lang="text">git clone git://git.apache.org/struts.git struts-copy
+</code></pre></div>
+<h2>Security patches</h2>
+
+<p><strong>Please read carefully, this is very important!</strong></p>
+
+<p>If you prepared a patch to solve security issue in Apache Struts, in the first step contact us via
+<a href="mailto:security@struts.apache.org">Security Mailing List</a>. Don't publish any information about possible vulnerability.
+Thus will allow us coordinate the work and review if the information about issue can be disclosed publicly.
+We don't want to inform hackers before we can protect our users :-)</p>
+
+<p><strong>Be responsible!!!</strong></p>
+
+<h2>Contributing with GitHub</h2>
+
+<p>Using GitHub mirror is the simplest way to contribute to Apache Struts if you are not a member
+of Struts Comitters group.</p>
+
+<p>First you must have an account created at GitHub to be able perform the next step. If you don't,
+go ahead and create one just right now! Please remember to setup
+<a href="https://help.github.com/articles/generating-ssh-keys">SSH keys</a> and test them!</p>
+
+<p>When ready go to <a href="https://github.com/apache/struts">https://github.com/apache/struts</a> and click <code>Fork</code> button
+in top right corner. This will fork Apache Struts repository and will create your private (but public) repository
+with the source code.</p>
+
+<p>Next step is to clone your repo locally, information how to do this you will find on right sidebar of your repo
+under <code>SSH clone URL</code> headline.</p>
+
+<p>Now you are ready to work with Apache Struts code base. Perform your changes, commit them and
+next push to GitHub! Remember: commit in Git is different than commit in Subversion!</p>
+
+<p>With your changes pushed to GitHub you can prepare a Pull Request (short: PR). Go to Apache Struts
+mirror - <a href="https://github.com/apache/struts">https://github.com/apache/struts</a> - then to
+<a href="https://github.com/apache/struts/pulls">Pull request</a> and hit
+<a href="https://github.com/apache/struts/compare/">New Pull Request</a> button.</p>
+
+<p>If not already selected, click on <code>compare across forks.</code> Right now you must select from the dropdowns on right
+your fork and branch to compare the differences with Apache Struts develop branch.</p>
+
+<p>Finally hit <code>Create Pull Request</code> button and you are done!</p>
+
+<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>