Author: buildbot
Date: Thu Feb 14 13:18:57 2013
New Revision: 850592
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/contributing.html
Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.
Modified: websites/production/camel/content/contributing.html
==============================================================================
--- websites/production/camel/content/contributing.html (original)
+++ websites/production/camel/content/contributing.html Thu Feb 14 13:18:57 2013
@@ -106,9 +106,11 @@
<p>Please raise a new issue in our <a shape="rect" class="external-link"
href="http://issues.apache.org/activemq/browse/CAMEL";>issue tracker</a></p>
+
<p>If you can create a JUnit test case then your issue is more likely to be
resolved quicker.<br clear="none">
e.g. take a look at some of the existing <a shape="rect" class="external-link"
href="https://svn.apache.org/repos/asf/camel/trunk/camel-core/src/test/java/";>unit
tests cases</a></p>
+
<p>Then we can add your issue to Subversion and then we'll know when its
really fixed and we can ensure that the problem stays fixed in future
releases.</p>
<h2><a shape="rect" name="Contributing-Workingonthecode"></a>Working on the
code</h2>
@@ -160,6 +162,65 @@ svn diff Main.java >> patchfile.tx
<p>Remember to create and attach the patch in two steps, as JIRA does not
support granting ASF license to the patch in the create ticket wizard. So after
creating the ticket, then attach the patch and remember to tick off the grant
ASF license, otherwise we can not commit the patch. We prefer patches has unit
tests as well and that these unit tests have proper assertions as well, so
remember to replace your system.out or logging with an assertion instead!</p>
+<h2><a shape="rect" name="Contributing-WorkingwithGit"></a>Working with
Git</h2>
+
+<p>While several committer are working with Git, it is not the primary version
control system at Apache Software Foundation. This is because the ASF has to
ensure that each commit into the codebase is correct licensed. With the current
VCS - Subversion - only committers with a signed CLA have write access.</p>
+
+<p>But there are several ways how Git users could improve Camel with their
prefered tool:</p>
+<ul><li>git-svn</li><li>Apache Git Mirror</li><li>Pull request at
Github</li></ul>
+
+
+<p>The minor "problem" is creating the local repository connected to the
official repository. Next step is modifying the codebase. The major "problem"
then is getting the modifications back to the official ASF repository.<br
clear="none">
+Depending on the chosen way these steps differ which is short described here.
</p>
+
+<h3><a shape="rect" name="Contributing-gitsvn"></a>git-svn</h3>
+
+<p>With Git you cannot fork another Git repository - you also could "fork" a
subversion repository.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-java">
+git svn clone https:<span
class="code-comment">//svn.apache.org/repos/asf/camel/trunk
<TargetDirectory> </span>
+</pre>
+</div></div>
+
+<p>If you have write access to the codebase you could fork from the
https-adress and just "push" your changes back:</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-java">
+git svn dcommit -m <span class="code-quote">"message"</span>
+</pre>
+</div></div>
+
+<p>Without that privilege you could follow the <a shape="rect"
class="external-link"
href="https://git-wip-us.apache.org/docs/workflow.html";>recommended
workflow</a>: working on a feature branch, create a patch and attach it to
Jira. Attaching to Jira has the benefit for the community that you are enforced
to grant explicitly the license to the ASF.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-java">
+git format-patch origin/trunk
+</pre>
+</div></div>
+
+<h3><a shape="rect" name="Contributing-ApacheGitMirror"></a>Apache Git
Mirror</h3>
+
+<p>Forking the Git repo from here is much smoother, because you are forking a
"real" Git repo.</p>
+<div class="code panel" style="border-width: 1px;"><div class="codeContent
panelContent">
+<pre class="code-java">
+git fork git:<span class="code-comment">//git.apache.org/camel.git
<TargetDirectory> </span>
+</pre>
+</div></div>
+
+<p>Bringing your modifications back to Apache is the <a shape="rect"
class="external-link"
href="https://git-wip-us.apache.org/docs/workflow.html";>same workflow as
described before</a>.</p>
+
+<p>Drawback of this Apache Git repository is that it is a "mirror" with a day
relay. So you are one day behind the community ...</p>
+
+<h3><a shape="rect" name="Contributing-PullrequestatGithub"></a>Pull request
at Github</h3>
+
+<p>There is also a Git <a shape="rect" class="external-link"
href="https://github.com/apache/camel"; rel="nofollow">repository at Github</a>
which you could fork. Then you work on a new feature branch and send a pull
request. For granting the license you also should create a Jira issue with a
reference to that pull request. One of the committers then could bring that
changesets to the ASF codebase via his/her own local repository. After closing
the Jira issue you have to close the pull request because we can't do that...
</p>
+
+<p>Same drawback here - it is one day behind ...</p>
+
+<h3><a shape="rect" name="Contributing-Moreresources"></a>More resources</h3>
+
+<p>Git is not a brand new technology and therefore Camel is not the only ASF
project thinking about using it. So here are some more resources you mind find
useful:</p>
+<ul><li><a shape="rect" class="external-link"
href="http://wiki.apache.org/general/GitAtApache:";>http://wiki.apache.org/general/GitAtApache:</a>
Some basic notes about git@asf</li><li><a shape="rect" class="external-link"
href="http://git.apache.org/:";>http://git.apache.org/:</a> List of mgit-mirrors
at ASF</li><li><a shape="rect" class="external-link"
href="https://git-wip-us.apache.org/:";>https://git-wip-us.apache.org/:</a> More
Git infos from Apache</li></ul>
+
+
<h2><a shape="rect" name="Contributing-Becomingacommitter"></a>Becoming a
committer</h2>
<p>Once you've got involved as above, we may well invite you to be a
committer. See <a shape="rect" href="how-do-i-become-a-committer.html"
title="How do I become a committer">How do I become a committer</a> for more
details.</p>
