svn commit: r870036 - in /websites/staging/accumulo/trunk/content: ./ source.html

[bu...@apache.org]

Author: buildbot
Date: Thu Jul 18 22:09:26 2013
New Revision: 870036

Log:
Staging update by buildbot for accumulo

Modified:
    websites/staging/accumulo/trunk/content/   (props changed)
    websites/staging/accumulo/trunk/content/source.html

Propchange: websites/staging/accumulo/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul 18 22:09:26 2013
@@ -1 +1 @@
-1502391
+1504685

Modified: websites/staging/accumulo/trunk/content/source.html
==============================================================================
--- websites/staging/accumulo/trunk/content/source.html (original)
+++ websites/staging/accumulo/trunk/content/source.html Thu Jul 18 22:09:26 2013
@@ -89,8 +89,8 @@
   <div id="content">
     <h1 class="title">Apache Accumulo Source Code &amp; Developers Guide</h1>
     <h2 id="source-code">Source Code</h2>
-<p>Apache Accumulo&trade; source code is maintained using <a href="http://subversion.apache.org/">Apache Subversion</a> version control 
-(<a href="http://svn.apache.org/viewvc/accumulo/">browse</a>|<a href="https://svn.apache.org/repos/asf/accumulo/trunk/">checkout</a>).  It builds with <a href="http://maven.apache.org/">Apache Maven</a>.</p>
+<p>Apache Accumulo&trade; source code is maintained using <a href="http://gitscm.com/">Git</a> version control 
+(<a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=summary">browse</a>).  It builds with <a href="http://maven.apache.org/">Apache Maven</a>.</p>
 <h2 id="website">Website</h2>
 <p>Accumulo's web site is also maintained in Subversion using Apache's <a href="http://www.apache.org/dev/cms.html">Content Management System</a>.
 Committers may edit the site by following <a href="http://www.apache.org/dev/cms.html#usage">these instructions</a>.  Non-committers should follow
@@ -103,15 +103,15 @@ stubs. If you don't have Apache Thrift i
 will wait for you to enter a newline to proceed. To avoid this, install Thrift 0.9 and make sure that the 
 'thrift' command is in your path. Watch out for THRIFT-1367; you may need to configure Thrift with
 --without-ruby.</p>
-<h4 id="checking-out-from-svn">Checking out from svn</h4>
+<h4 id="checking-out-from-git">Checking out from git</h4>
 <p>To check out the code:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span class="n">vn</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span class="sr">/accumulo/</span><span class="n">trunk</span><span class="o">/</span>
+<div class="codehilite"><pre><span class="n">git</span> <span class="n">clone</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">git</span><span class="o">-</span><span class="n">wip</span><span class="o">-</span><span class="n">us</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">accumulo</span><span class="p">.</span><span class="n">git</span>
 </pre></div>
 
 
 <h4 id="building">Building</h4>
 <p>To build the code:</p>
-<div class="codehilite"><pre><span class="n">mvn</span> <span class="nb">package</span> <span class="o">-</span><span class="n">P</span> <span class="n">assemble</span>
+<div class="codehilite"><pre><span class="n">mvn</span> <span class="n">package</span> <span class="o">-</span><span class="n">P</span> <span class="n">assemble</span>
 </pre></div>
 
 
@@ -126,26 +126,7 @@ will wait for you to enter a newline to 
 <h3 id="issue-tracking">Issue Tracking</h3>
 <p>Accumulo <a href="https://issues.apache.org/jira/browse/accumulo">tracks issues</a> with <a href="http://www.atlassian.com/software/jira/overview">JIRA</a>.  Every commit should reference a JIRA ticket of the form ACCUMULO-#.</p>
 <h3 id="merging-practices">Merging Practices</h3>
-<p>Changes should be merged from earlier branches of Accumulo to later branches.  Currently, all changes are being merged from the 1.4 branch and later, but not all changes are merged from the 1.3 branch.  When you make a change in branch 1.x, use the following process to merge to subsequent versions 1.y and 1.z:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">merge</span> <span class="o">-</span><span class="n">r</span> <span class="mi">1</span><span class="p">:</span><span class="n">HEAD</span> <span class="mi">1</span><span class="o">.</span><span class="n">x_svn_url</span> <span class="mi">1</span><span class="o">.</span><span class="n">y_local_dir</span>
-
-<span class="n">examine</span> <span class="n">merged</span> <span class="n">files</span> <span class="ow">and</span> <span class="n">conflicts</span>
-
-<span class="n">svn</span> <span class="n">ci</span> <span class="mi">1</span><span class="o">.</span><span class="n">y_local_dir</span>
-
-<span class="n">make</span> <span class="n">sure</span> <span class="n">the</span> <span class="n">commit</span> <span class="n">includes</span> <span class="n">the</span> <span class="n">svn</span> <span class="n">mergeinfo</span>
-
-<span class="n">svn</span> <span class="n">merge</span> <span class="o">-</span><span class="n">r</span> <span class="mi">1</span><span class="p">:</span><span class="n">HEAD</span> <span class="mi">1</span><span class="o">.</span><span class="n">y_svn_url</span> <span class="mi">1</span><span class="o">.</span><span class="n">z_local_dir</span>
-
-<span class="n">examine</span> <span class="n">merged</span> <span class="n">files</span> <span class="ow">and</span> <span class="n">conflicts</span>
-
-<span class="n">svn</span> <span class="n">ci</span> <span class="mi">1</span><span class="o">.</span><span class="n">z_local_dir</span>
-
-<span class="n">make</span> <span class="n">sure</span> <span class="n">the</span> <span class="n">commit</span> <span class="n">includes</span> <span class="n">the</span> <span class="n">svn</span> <span class="n">mergeinfo</span>
-</pre></div>
-
-
-<p>An additional step is now required to merge from 1.4 to 1.5 since the directory structure changed.  Ask the dev list for instructions.</p>
+<p>Changes should be merged from earlier branches of Accumulo to later branches.  Ask the dev list for instructions.</p>
 <h3 id="coding-practices">Coding Practices</h3>
 <ul>
 <li>License Header: Always add the current ASF license header as described in <a href="http://www.apache.org/legal/src-headers.html">ASF Source Header</a>.</li>
@@ -157,7 +138,7 @@ will wait for you to enter a newline to 
 </ul>
 <h3 id="eclipse-configuration-tips">Eclipse Configuration Tips</h3>
 <ul>
-<li>Download Eclipse <a href="https://svn.apache.org/repos/asf/accumulo/trunk/contrib/">formatting and style guides for Accumulo</a>.</li>
+<li>Download Eclipse <a href="https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=tree;f=contrib;h=e43cff51b721cf7fc48ce5e3cf5c9b25cd3d1166;hb=HEAD">formatting and style guides for Accumulo</a>.</li>
 <li>Import Formatter: Preferences &gt; Java &gt; Code Style &gt;  Formatter and import the Eclipse-Accumulo-Codestyle.xml downloaded in the previous step. </li>
 <li>Import Template: Preferences &gt; Java &gt; Code Style &gt; Code Templates and import the Eclipse-Accumulo-Template.xml. Make sure to check the "Automatically add comments" box. This template adds the ASF header and so on for new code.</li>
 </ul>
@@ -165,8 +146,8 @@ will wait for you to enter a newline to 
 <ul>
 <li>Formatter <a href="https://code.google.com/p/eclipse-code-formatter-intellij-plugin/">plugin</a> that uses eclipse code style xml.</li>
 </ul>
-<h3 id="svn">SVN</h3>
-<p>Instructions for configuring svn clients are <a href="http://www.apache.org/dev/version-control.html#https-svn-config">here</a>.</p>
+<h3 id="git">Git</h3>
+<p>Instructions for configuring git are <a href="https://git-wip-us.apache.org/">here</a>.</p>
 <h3 id="release-guide">Release Guide</h3>
 <p>Accumulo's release guide can be found <a href="/governance/releasing.html">here</a>.</p>
   </div>