maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r841370 [3/47] - in /websites/staging/maven/trunk/content: ./ ant/ background/ css/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ docs/2.0.1/ docs/2.0.10/ docs/2.0.11/ docs/2.0.2/ docs/2.0.3/ docs/2.0.4/ ...
Date Mon, 10 Dec 2012 08:17:44 GMT
Added: websites/staging/maven/trunk/content/css/maven-base.css
==============================================================================
--- websites/staging/maven/trunk/content/css/maven-base.css (added)
+++ websites/staging/maven/trunk/content/css/maven-base.css Mon Dec 10 08:17:24 2012
@@ -0,0 +1,156 @@
+body {
+  margin: 0px;
+  padding: 0px;
+}
+img {
+  border:none;
+}
+table {
+  padding:0px;
+  width: 100%;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+  padding: 2px 4px 2px 4px;
+  vertical-align: top;
+}
+div.clear{
+  clear:both;
+  visibility: hidden;
+}
+div.clear hr{
+  display: none;
+}
+#bannerLeft, #bannerRight {
+  font-size: xx-large;
+  font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+  margin: 0px;
+}
+.xleft, #bannerLeft img {
+  float:left;
+}
+.xright, #bannerRight {
+  float:right;
+}
+#banner {
+  padding: 0px;
+}
+#banner img {
+  border: none;
+}
+#breadcrumbs {
+  padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+ padding-bottom: 3px; /* IE-9 scrollbar-fix */
+}
+#bodyColumn {
+  margin-right: 1.5em;
+  margin-left: 197px;
+}
+#legend {
+  padding: 8px 0 8px 0;
+}
+#navcolumn {
+  padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn ul {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn li {
+  list-style-type: none;
+  background-image: none;
+  background-repeat: no-repeat;
+  background-position: 0 0.4em;
+  padding-left: 16px;
+  list-style-position: outside;
+  line-height: 1.2em;
+  font-size: smaller;
+}
+#navcolumn li.expanded {
+  background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+  background-image: url(../images/collapsed.gif);
+}
+#navcolumn li.none {
+  text-indent: -1em;
+  margin-left: 1em;
+}
+#poweredBy {
+  text-align: center;
+}
+#navcolumn img {
+  margin-top: 10px;
+  margin-bottom: 3px;
+}
+#poweredBy img {
+  display:block;
+  margin: 20px 0 20px 17px;
+}
+#search img {
+    margin: 0px;
+    display: block;
+}
+#search #q, #search #btnG {
+    border: 1px solid #999;
+    margin-bottom:10px;
+}
+#search form {
+    margin: 0px;
+}
+#lastPublished {
+  font-size: x-small;
+}
+.navSection {
+  margin-bottom: 2px;
+  padding: 8px;
+}
+.navSectionHead {
+  font-weight: bold;
+  font-size: x-small;
+}
+.section {
+  padding: 4px;
+}
+#footer {
+  padding: 3px 10px 3px 10px;
+  font-size: x-small;
+}
+#breadcrumbs {
+  font-size: x-small;
+  margin: 0pt;
+}
+.source {
+  padding: 12px;
+  margin: 1em 7px 1em 7px;
+}
+.source pre {
+  margin: 0px;
+  padding: 0px;
+}
+#navcolumn img.imageLink, .imageLink{
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  padding-right: 2px;
+  border: 0px;
+  margin: 0px;
+}

Added: websites/staging/maven/trunk/content/css/maven-theme.css
==============================================================================
--- websites/staging/maven/trunk/content/css/maven-theme.css (added)
+++ websites/staging/maven/trunk/content/css/maven-theme.css Mon Dec 10 08:17:24 2012
@@ -0,0 +1,217 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+body {
+  background-color: #fff;
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  margin-left: auto;
+  margin-right: auto;
+  background-repeat: repeat-y;
+  font-size: 13px;
+  padding: 0px;
+}
+td, select, input, li{
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: 12px;
+  color:#333333;
+}
+code{
+  font-size: 12px;
+}
+a {
+  text-decoration: none;
+}
+a:link {
+  color:#47a;
+}
+a:visited {
+  color:#68a;
+}
+a:active, a:hover {
+  color:#990000;
+}
+#legend li.externalLink {
+  background: url(../images/external.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: url(../images/external.png) right center no-repeat;
+  padding-right: 18px;
+}
+#legend li.newWindow {
+  background: url(../images/newwindow.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover {
+  background: url(../images/newwindow.png) right center no-repeat;
+  padding-right: 18px;
+}
+h2 {
+  font-size: 17px;
+  color: #333333;
+}
+h3 {
+  padding: 4px 4px 4px 24px;
+  color: #666;
+  background-color: #ccc;
+  font-weight: bold;
+  font-size: 14px;
+  background-image: url(../images/h3.jpg);
+  background-repeat: no-repeat;
+  background-position: left bottom;
+}
+p {
+  line-height: 1.3em;
+  font-size: 12px;
+  color: #000;
+}
+#breadcrumbs {
+  height: 13px;
+  background-image: url(../images/breadcrumbs.jpg);
+  padding: 5px 10px 14px 20px;
+}
+* html #breadcrumbs {
+  padding-bottom: 8px;
+}
+#leftColumn {
+  margin: 10px 0 10px 0;
+  border-top-color: #ccc;
+  border-top-style: solid;
+  border-top-width: 1px;
+  border-right-color: #ccc;
+  border-right-style: solid;
+  border-right-width: 1px;
+  border-bottom-color: #ccc;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  padding-right: 5px;
+  padding-left: 5px;
+}
+#navcolumn h5 {
+  font-size: smaller;
+  border-bottom: 1px solid #aaaaaa;
+  padding-top: 2px;
+  padding-left: 9px;
+  color: #49635a;
+  background-image: url(../images/h5.jpg);
+  background-repeat: no-repeat;
+  background-position: left bottom;
+}
+
+table.bodyTable th {
+  color: white;
+  background-color: #bbb;
+  text-align: left;
+  font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 11px;
+}
+
+table.bodyTable tr.a {
+  background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+  background-color: #eee;
+}
+
+table.bodyTable tr.a:hover, table.bodyTable tr.b:hover {
+  background: #dfe3db;
+}
+
+.source {
+  border: 1px solid #999;
+  overflow:auto
+}
+dt {
+  padding: 4px 4px 4px 24px;
+  color: #333333;
+  background-color: #ccc;
+  font-weight: bold;
+  font-size: 14px;
+  background-image: url(../images/h3.jpg);
+  background-repeat: no-repeat;
+  background-position: left bottom;
+}
+.subsectionTitle {
+  font-size: 13px;
+  font-weight: bold;
+  color: #666;
+
+}
+
+table {
+  font-size: 10px;
+}
+.xright a:link, .xright a:visited, .xright a:active {
+  color: #666;
+}
+.xright a:hover {
+  color: #003300;
+}
+#banner {
+  height: 93px;
+  background: url(../images/banner.jpg);
+}
+#navcolumn ul {
+  margin: 5px 0 15px -0em;
+}
+#navcolumn ul a {
+  color: #333333;
+}
+#navcolumn ul a:hover {
+  color: red;
+}
+#intro {
+  border: solid #ccc 1px;
+  margin: 6px 0px 0px 0px;
+  padding: 10px 40px 10px 40px;
+}
+.subsection {
+  margin-left: 3px;
+  color: #333333;
+}
+
+.subsection p {
+  font-size: 12px;
+}
+#footer {
+  padding: 10px;
+  margin: 20px 0px 20px 0px;
+  border-top: solid #ccc 1px;
+  color: #333333;
+}
+
+.errormark, .warningmark, .donemark, .infomark {
+  background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+  background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+  background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+  background-image: url(../images/icon_info_sml.gif);
+}

Added: websites/staging/maven/trunk/content/css/print.css
==============================================================================
--- websites/staging/maven/trunk/content/css/print.css (added)
+++ websites/staging/maven/trunk/content/css/print.css Mon Dec 10 08:17:24 2012
@@ -0,0 +1,7 @@
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+	display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+	margin: 0 !important;
+	border: none !important
+}

Added: websites/staging/maven/trunk/content/css/site.css
==============================================================================
--- websites/staging/maven/trunk/content/css/site.css (added)
+++ websites/staging/maven/trunk/content/css/site.css Mon Dec 10 08:17:24 2012
@@ -0,0 +1,38 @@
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: none;
+  padding-right: 0;
+}
+
+body ul {
+  list-style-type: square;
+}
+
+#downloadbox {
+  float: right;
+  margin-left: 2em;
+  padding-left: 1em;
+  padding-right: 1em;
+  padding-bottom: 1em;
+  border: 1px solid #999;
+  background-color: #eee;
+  width: 17.5em;
+}
+
+#downloadbox h5 {
+  color: #000;
+  margin: 0;
+  border-bottom: 1px solid #aaaaaa;
+  font-size: smaller;
+  padding: 0;
+  margin-top: 1em;
+}
+
+#downloadbox p {
+  margin-top: 1em;
+  margin-bottom: 0;
+}
+
+#downloadbox li {
+  text-indent: inherit;
+}
+

Added: websites/staging/maven/trunk/content/developers/.htaccess
==============================================================================
--- websites/staging/maven/trunk/content/developers/.htaccess (added)
+++ websites/staging/maven/trunk/content/developers/.htaccess Mon Dec 10 08:17:24 2012
@@ -0,0 +1,4 @@
+RedirectMatch permanent (.*)/developers/committer-testing-plugins.html $1/plugin-developers/plugin-testing.html
+RedirectMatch permanent (.*)/developers/committer-documentation-plugins.html $1/plugin-developers/plugin-documenting.html
+RedirectMatch permanent (.*)/developers/release/maven-proper-release.html $1/developers/release/maven-core-release.html
+RedirectMatch permanent (.*)/developers/release/apache-release.html http://www.apache.org/dev/publishing-maven-artifacts.html

Added: websites/staging/maven/trunk/content/developers/committer-environment.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/committer-environment.html (added)
+++ websites/staging/maven/trunk/content/developers/committer-environment.html Mon Dec 10 08:17:24 2012
@@ -0,0 +1,269 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ | Generated by Apache Maven Doxia at Dec 10, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Maven - Developers centre - Commiter Environment</title>
+    <style type="text/css" media="all">
+      @import url("../css/maven-base.css");
+      @import url("../css/maven-theme.css");
+      @import url("../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Vincent Siveton" />
+        <meta name="Date-Revision-yyyymmdd" content="20121210" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                              </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href=".././" id="bannerLeft">
+                                                <img src="../images/apache-maven-project-2.png" alt="" />
+                </a>
+                        <span id="bannerRight">
+                                                <img src="../images/maven-logo-2.gif" alt="" />
+                </span>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                   <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../index.html">Maven</a>
+        &gt;
+        Developers centre - Commiter Environment
+        </div>
+            <div class="xright">        
+                                    Last Published: 2012-12-10
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                   <h5>Main</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../index.html">Welcome</a>
+            </li>
+          </ul>
+                       <h5>Get Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../download.html">Download</a>
+            </li>
+                  <li class="none">
+                  <a href="../docs/3.0.4/release-notes.html">Release Notes (3.0.4)</a>
+            </li>
+                  <li class="none">
+                  <a href="../docs/2.2.1/release-notes.html">Release Notes (2.2.1)</a>
+            </li>
+                  <li class="none">
+                  <a href="../docs/2.0.11/release-notes.html">Release Notes (2.0.11)</a>
+            </li>
+                  <li class="none">
+                  <a href="../license.html">License</a>
+            </li>
+          </ul>
+                       <h5>IDE Integration</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../eclipse-plugin.html">Eclipse</a>
+            </li>
+                  <li class="none">
+                  <a href="../netbeans-module.html">NetBeans</a>
+            </li>
+          </ul>
+                       <h5>About Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../what-is-maven.html">What is Maven?</a>
+            </li>
+                  <li class="none">
+                  <a href="../maven-features.html">Features</a>
+            </li>
+                  <li class="none">
+                  <a href="../general.html">FAQ (official)</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink">FAQ (unofficial)</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../plugins/index.html">Maven Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../guides/index.html">Index (category)</a>
+            </li>
+                  <li class="none">
+                  <a href="../run-maven/index.html">Running Maven</a>
+            </li>
+                                                                                                                                            <li class="collapsed">
+                  <a href="../users/index.html">User Centre</a>
+                  </li>
+                                                                                                        <li class="collapsed">
+                  <a href="../plugin-developers/index.html">Plugin Developer Centre</a>
+                  </li>
+                  <li class="none">
+                  <a href="../repository/index.html">Maven Repository Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../developers/index.html">Maven Developer Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../articles.html">Books and Resources</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/Home" class="externalLink">Wiki</a>
+            </li>
+          </ul>
+                       <h5>Community</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../community.html">Community Overview</a>
+            </li>
+                  <li class="none">
+                  <a href="../guides/development/guide-helping.html">How to Contribute</a>
+            </li>
+                  <li class="none">
+                  <a href="../guides/mini/guide-maven-evangelism.html">Maven Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../users/getting-help.html">Getting Help</a>
+            </li>
+                  <li class="none">
+                  <a href="../issue-tracking.html">Issue Tracking</a>
+            </li>
+                  <li class="none">
+                  <a href="../source-repository.html">Source Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../team-list.html">The Maven Team</a>
+            </li>
+          </ul>
+                       <h5>Project Documentation</h5>
+                  <ul>
+                                                                                                                          <li class="collapsed">
+                  <a href="../project-info.html">Project Information</a>
+                  </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia/index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../index.html">Maven 2 & 3</a>
+            </li>
+                  <li class="none">
+                  <a href="../pom/index.html">Parent POMs</a>
+            </li>
+                  <li class="none">
+                  <a href="../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../plugin-tools/index.html">Plugin Tools</a>
+            </li>
+                  <li class="none">
+                  <a href="../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
+                  <a href="../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
+        </a>
+                       
+                               </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Introduction<a name="Introduction"></a></h2><p>This document is intended to set up the Maven committer environment.</p></div><div class="section"><h2><a name="Source_File_Encoding">Source File Encoding</a></h2><p>When editing source files, make sure you use the right file encoding. For the Maven project, UTF-8 has been chosen as the default file encoding. UTF-8 is an encoding scheme for the Unicode character set and as such allows to encode all characters that Java can handle. The source files should not contain the byte order mark (BOM). There can be exceptions to this general rule, e.g. properties files are usually encoded using ISO-8859-1 as per the JRE API, so please keep this in mind, too.</p></div><div class="section"><h2>Subversion Configuration<a name="Subversion_Configuration"></a></h2><p>Before committing files in subversion repository, you need to read the <a class="externalLink" href="http://www.apache.org/dev/versi
 on-control.html#https-svn">Committer Subversion Access</a> document and you must set your svn client with this properties file: <a href="./svn-eol-style.txt">svn-eol-style.txt</a></p></div><div class="section"><h2><a name="Maven_Code_Style">Maven Code Style</a></h2><p>The following sections show how to set up the code style for Maven in IDEA and Eclipse. It is strongly preferred that patches use this style before they are supplied.</p><div class="section"><h3>IntelliJ IDEA 4.5+<a name="IntelliJ_IDEA_4.5"></a></h3><p>Download <tt><a href="./maven-idea-codestyle.xml">maven-idea-codestyle.xml</a></tt> and copy it to <tt>~/.IntelliJIDEA/config/codestyles</tt> then restart IDEA. On Windows, try <tt>C:\Documents and Settings\&lt;username&gt;\.IntelliJIDEA\config\codestyles</tt></p><p>After this, restart IDEA and open the settings to select the new code style.</p></div><div class="section"><h3>Eclipse 3.2+<a name="Eclipse_3.2"></a></h3><p>Download <tt><a href="./maven-eclipse-codes
 tyle.xml">maven-eclipse-codestyle.xml</a></tt>.</p><p>After this, select Window &gt; Preferences, and open up the configuration for Java &gt; Code Style &gt; Code Formatter. Click on the button labeled Import... and select the file you downloaded. Give the style a name, and click OK.</p></div></div><div class="section"><h2>Setting up SSH public/private keys<a name="Setting_up_SSH_publicprivate_keys"></a></h2><p>By default, SSH (Secure Shell) asks you to enter your password each time, i.e.:</p><div class="source"><pre>&gt;ssh YOUR_APACHE_USERNAME@people.apache.org
+Password:</pre></div><p>SSH can be set up with public/private key pairs so that you don't have to type the password each time. You need to execute the following on your development machine:</p><div class="source"><pre>&gt; cd ~/.ssh
+&gt; ssh-keygen -t dsa -f YOUR_APACHE_USERNAME@apache.org -C YOUR_APACHE_USERNAME@apache.org
+Generating public/private dsa key pair.
+Enter passphrase (empty for no passphrase): (just type return)
+Enter same passphrase again: (just type return)
+Your identification has been saved in YOUR_APACHE_USERNAME@apache.org.
+Your public key has been saved in YOUR_APACHE_USERNAME@apache.org.pub.
+The key fingerprint is:
+0c:16:c7:44:9e:a6:2c:c0:8a:87:04:07:a0:5b:94:d2 YOUR_APACHE_USERNAME@apache.org</pre></div><p>Then, paste the content of the local <tt>~/.ssh/YOUR_APACHE_USERNAME.pub</tt> file into the file <tt>/home/YOUR_APACHE_USERNAME/.ssh/authorized_keys</tt> on the Apache remote host.</p><p><b>Note</b>: under Cygwin, it is located at <tt>{cygwin.install.path}\home\YOUR_MACHINE_USERNAME\.ssh</tt>. You need to copy the content of <tt>{cygwin.install.path}\home\YOUR_MACHINE_USERNAME\.ssh</tt> into <tt>C:\Documents and Settings\YOUR_MACHINE_USERNAME\.ssh</tt> for Maven.</p><p>You also need to modify the <tt>~/.ssh/config</tt> to use this identity file when communicating with *.apache.org</p><div class="source"><pre>Host *.apache.org
+User=YOUR_APACHE_USERNAME
+IdentityFile=~/.ssh/YOUR_APACHE_USERNAME@apache.org</pre></div><p>To test the installation, try to log in again on Apache. You should not be asked for your password any more.</p><div class="source"><pre> &gt; ssh YOUR_APACHE_USERNAME@people.apache.org
+Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994
+        The Regents of the University of California.  All rights reserved.
+
+FreeBSD 8.2-RELEASE-p4 (GENERIC) #1 r226043: Wed Oct  5 18:45:41 UTC 2011
+
+This is minotaur.apache.org (a.k.a. people.apache.org). 
+...
+YOUR_APACHE_USERNAME@minotaur:~$</pre></div></div><div class="section"><h2>Useful software<a name="Useful_software"></a></h2><p>The Maven Team uses several software. Here is a partial list:</p><ul><li><a class="externalLink" href="http://www.cygwin.com/">Cygwin</a>: collection of free software tools to allow various versions of Microsoft Windows to act somewhat like a Unix system</li><li><a class="externalLink" href="http://winscp.net/">WinSCP</a>: SFTP client for Windows.</li><li><a class="externalLink" href="http://tortoisesvn.tigris.org/">TortoiseSVN</a>: Subversion client, implemented as a Windows shell extension.</li><li><a class="externalLink" href="http://www.gnupg.org/">GnuPG</a>: GNU Privacy Guard.</li></ul></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2002-2012
+              The Apache Software Foundation
+            
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/maven/trunk/content/developers/committer-settings.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/committer-settings.html (added)
+++ websites/staging/maven/trunk/content/developers/committer-settings.html Mon Dec 10 08:17:24 2012
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ | Generated by Apache Maven Doxia at Dec 10, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Maven - Developers centre - Committer Settings</title>
+    <style type="text/css" media="all">
+      @import url("../css/maven-base.css");
+      @import url("../css/maven-theme.css");
+      @import url("../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Vincent Siveton
+Dennis Lundberg" />
+        <meta name="Date-Creation-yyyymmdd" content="20110523" />
+    <meta name="Date-Revision-yyyymmdd" content="20121210" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                              </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href=".././" id="bannerLeft">
+                                                <img src="../images/apache-maven-project-2.png" alt="" />
+                </a>
+                        <span id="bannerRight">
+                                                <img src="../images/maven-logo-2.gif" alt="" />
+                </span>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                   <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../index.html">Maven</a>
+        &gt;
+        Developers centre - Committer Settings
+        </div>
+            <div class="xright">        
+                                    Last Published: 2012-12-10
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                   <h5>Main</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../index.html">Welcome</a>
+            </li>
+          </ul>
+                       <h5>Get Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../download.html">Download</a>
+            </li>
+                  <li class="none">
+                  <a href="../docs/3.0.4/release-notes.html">Release Notes (3.0.4)</a>
+            </li>
+                  <li class="none">
+                  <a href="../docs/2.2.1/release-notes.html">Release Notes (2.2.1)</a>
+            </li>
+                  <li class="none">
+                  <a href="../docs/2.0.11/release-notes.html">Release Notes (2.0.11)</a>
+            </li>
+                  <li class="none">
+                  <a href="../license.html">License</a>
+            </li>
+          </ul>
+                       <h5>IDE Integration</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../eclipse-plugin.html">Eclipse</a>
+            </li>
+                  <li class="none">
+                  <a href="../netbeans-module.html">NetBeans</a>
+            </li>
+          </ul>
+                       <h5>About Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../what-is-maven.html">What is Maven?</a>
+            </li>
+                  <li class="none">
+                  <a href="../maven-features.html">Features</a>
+            </li>
+                  <li class="none">
+                  <a href="../general.html">FAQ (official)</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink">FAQ (unofficial)</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../plugins/index.html">Maven Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../guides/index.html">Index (category)</a>
+            </li>
+                  <li class="none">
+                  <a href="../run-maven/index.html">Running Maven</a>
+            </li>
+                                                                                                                                            <li class="collapsed">
+                  <a href="../users/index.html">User Centre</a>
+                  </li>
+                                                                                                        <li class="collapsed">
+                  <a href="../plugin-developers/index.html">Plugin Developer Centre</a>
+                  </li>
+                  <li class="none">
+                  <a href="../repository/index.html">Maven Repository Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../developers/index.html">Maven Developer Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../articles.html">Books and Resources</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/Home" class="externalLink">Wiki</a>
+            </li>
+          </ul>
+                       <h5>Community</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../community.html">Community Overview</a>
+            </li>
+                  <li class="none">
+                  <a href="../guides/development/guide-helping.html">How to Contribute</a>
+            </li>
+                  <li class="none">
+                  <a href="../guides/mini/guide-maven-evangelism.html">Maven Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../users/getting-help.html">Getting Help</a>
+            </li>
+                  <li class="none">
+                  <a href="../issue-tracking.html">Issue Tracking</a>
+            </li>
+                  <li class="none">
+                  <a href="../source-repository.html">Source Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../team-list.html">The Maven Team</a>
+            </li>
+          </ul>
+                       <h5>Project Documentation</h5>
+                  <ul>
+                                                                                                                          <li class="collapsed">
+                  <a href="../project-info.html">Project Information</a>
+                  </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia/index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../index.html">Maven 2 & 3</a>
+            </li>
+                  <li class="none">
+                  <a href="../pom/index.html">Parent POMs</a>
+            </li>
+                  <li class="none">
+                  <a href="../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../plugin-tools/index.html">Plugin Tools</a>
+            </li>
+                  <li class="none">
+                  <a href="../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
+                  <a href="../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
+        </a>
+                       
+                               </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Introduction<a name="Introduction"></a></h2><p>This document is intended to set up the Maven committer settings, i.e. the <tt>${user.home}/.m2/settings.xml</tt>.</p><div class="section"><h3>Enable Apache Servers<a name="Enable_Apache_Servers"></a></h3><p>Maven uses several servers configuration to deploy snapshots, releases and documentation on the Apache servers. You need to tell to Maven what your Apache username is. Please note that the servers now use your LDAP credentials, which may differ from your old SVN credentials.</p><p><b>It is highly recommended to use Maven's <a href="../guides/mini/guide-encryption.html"> password encryption capabilities</a> for your passwords</b>.</p><div class="source"><pre>&lt;settings&gt;
+  ...
+  &lt;servers&gt;
+    &lt;!-- To publish a snapshot of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.snapshots.https&lt;/id&gt;
+      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
+      &lt;password&gt; &lt;!-- YOUR APACHE LDAP PASSWORD --&gt; &lt;/password&gt;
+    &lt;/server&gt;
+    &lt;!-- To publish a website of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.website&lt;/id&gt;
+      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
+      &lt;!-- Either
+      &lt;password&gt;...&lt;/password&gt;
+      or
+      &lt;privateKey&gt;...&lt;/privateKey&gt;
+      ---&gt; 
+      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
+      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
+    &lt;/server&gt;
+    &lt;!-- To stage a release of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;apache.releases.https&lt;/id&gt;
+      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
+      &lt;password&gt; &lt;!-- YOUR APACHE LDAP PASSWORD --&gt; &lt;/password&gt;
+    &lt;/server&gt;
+    &lt;!-- To stage a website of some part of Maven --&gt;
+    &lt;server&gt;
+      &lt;id&gt;stagingSite&lt;/id&gt; &lt;!-- must match hard-coded repository identifier in site:stage-deploy --&gt;
+      &lt;username&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/username&gt;
+      &lt;filePermissions&gt;664&lt;/filePermissions&gt;
+      &lt;directoryPermissions&gt;775&lt;/directoryPermissions&gt;
+    &lt;/server&gt;
+    ...
+  &lt;/servers&gt;
+&lt;/settings&gt;</pre></div><p>You also need to be a member of the group <tt>apcvs</tt> and <tt>maven</tt> on <tt>people.apache.org</tt>.</p></div><div class="section"><h3>Enable sending announcement e-mails<a name="Enable_sending_announcement_e-mails"></a></h3><p>To be able to send out announcements of Maven releases you need to add a couple of properties to the <tt>apache-release</tt> profile.</p><div class="source"><pre>&lt;settings&gt;
+  ...
+  &lt;profiles&gt;
+    &lt;profile&gt;
+      &lt;id&gt;apache-release&lt;/id&gt;
+      &lt;properties&gt;
+        &lt;apache.availid&gt; &lt;!-- YOUR APACHE LDAP USERNAME --&gt; &lt;/apache.availid&gt;
+        &lt;smtp.host&gt; &lt;!-- YOUR SMTP SERVER --&gt; &lt;/smtp.host&gt;
+      &lt;/properties&gt;
+    &lt;/profile&gt;
+    ...
+  &lt;/profiles&gt;
+&lt;/settings&gt;</pre></div></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2002-2012
+              The Apache Software Foundation
+            
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/maven/trunk/content/developers/conventions/code.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/code.html (added)
+++ websites/staging/maven/trunk/content/developers/conventions/code.html Mon Dec 10 08:17:24 2012
@@ -0,0 +1,364 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ | Generated by Apache Maven Doxia at Dec 10, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Maven - Maven Code Style And Code Conventions</title>
+    <style type="text/css" media="all">
+      @import url("../../css/maven-base.css");
+      @import url("../../css/maven-theme.css");
+      @import url("../../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Vincent Siveton" />
+        <meta name="Date-Creation-yyyymmdd" content="20080705" />
+    <meta name="Date-Revision-yyyymmdd" content="20121210" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                              </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="../.././" id="bannerLeft">
+                                                <img src="../../images/apache-maven-project-2.png" alt="" />
+                </a>
+                        <span id="bannerRight">
+                                                <img src="../../images/maven-logo-2.gif" alt="" />
+                </span>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                   <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../../index.html">Maven</a>
+        &gt;
+        Maven Code Style And Code Conventions
+        </div>
+            <div class="xright">        
+                                    Last Published: 2012-12-10
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                   <h5>Main</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../index.html">Welcome</a>
+            </li>
+          </ul>
+                       <h5>Get Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../download.html">Download</a>
+            </li>
+                  <li class="none">
+                  <a href="../../docs/3.0.4/release-notes.html">Release Notes (3.0.4)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../docs/2.2.1/release-notes.html">Release Notes (2.2.1)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../docs/2.0.11/release-notes.html">Release Notes (2.0.11)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../license.html">License</a>
+            </li>
+          </ul>
+                       <h5>IDE Integration</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../eclipse-plugin.html">Eclipse</a>
+            </li>
+                  <li class="none">
+                  <a href="../../netbeans-module.html">NetBeans</a>
+            </li>
+          </ul>
+                       <h5>About Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../what-is-maven.html">What is Maven?</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-features.html">Features</a>
+            </li>
+                  <li class="none">
+                  <a href="../../general.html">FAQ (official)</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink">FAQ (unofficial)</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Maven Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../guides/index.html">Index (category)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../run-maven/index.html">Running Maven</a>
+            </li>
+                                                                                                                                            <li class="collapsed">
+                  <a href="../../users/index.html">User Centre</a>
+                  </li>
+                                                                                                        <li class="collapsed">
+                  <a href="../../plugin-developers/index.html">Plugin Developer Centre</a>
+                  </li>
+                  <li class="none">
+                  <a href="../../repository/index.html">Maven Repository Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../../developers/index.html">Maven Developer Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../../articles.html">Books and Resources</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/Home" class="externalLink">Wiki</a>
+            </li>
+          </ul>
+                       <h5>Community</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../community.html">Community Overview</a>
+            </li>
+                  <li class="none">
+                  <a href="../../guides/development/guide-helping.html">How to Contribute</a>
+            </li>
+                  <li class="none">
+                  <a href="../../guides/mini/guide-maven-evangelism.html">Maven Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../../users/getting-help.html">Getting Help</a>
+            </li>
+                  <li class="none">
+                  <a href="../../issue-tracking.html">Issue Tracking</a>
+            </li>
+                  <li class="none">
+                  <a href="../../source-repository.html">Source Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../../team-list.html">The Maven Team</a>
+            </li>
+          </ul>
+                       <h5>Project Documentation</h5>
+                  <ul>
+                                                                                                                          <li class="collapsed">
+                  <a href="../../project-info.html">Project Information</a>
+                  </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../../doxia/index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../../index.html">Maven 2 & 3</a>
+            </li>
+                  <li class="none">
+                  <a href="../../pom/index.html">Parent POMs</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugin-tools/index.html">Plugin Tools</a>
+            </li>
+                  <li class="none">
+                  <a href="../../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../../images/logos/maven-feather.png"/>
+        </a>
+                       
+                               </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Maven Code Style And Code Conventions<a name="Maven_Code_Style_And_Code_Conventions"></a></h2><p>This document describes how developers and contributors should write code. The reasoning of these styles and conventions is mainly for consistency, readability and maintainability reasons.</p><div class="section"><h3>Generic Code Style And Convention<a name="Generic_Code_Style_And_Convention"></a></h3><p>All working files (java, xml, others) should respect the following conventions:</p><ul><li><b>License Header</b>: Always add the current <a class="externalLink" href="http://www.apache.org/legal/src-headers.html#headers">ASF license header</a> in all versionned files.</li><li><b>Trailing Whitespaces</b>: Remove all trailing whitespaces. If your are an Eclipse user, you could use the <a class="externalLink" href="http://andrei.gmxhome.de/anyedit/">Anyedit Eclipse Plugin</a>.</li></ul><!-- * Using SVN properties like \$Id: \$ => Is it
  a wanted goal for all files like java or apt? --><p>and the following style:</p><ul><li><b>Indentation</b>: <b>Never</b> use tabs!</li><li><b>Line wrapping</b>: Always use a 120-column line width.</li></ul><p><b>Note</b>: The specific styles and conventions, listed in the next sections, could override these generic rules.</p></div><div class="section"><h3><a name="Java">Java</a></h3><div class="section"><h4><a name="Java_Code_Style">Java Code Style</a></h4><p>The Maven style for Java is mainly:</p><ul><li><b>White space</b>: One space after control statements and between arguments (i.e. <tt>if ( foo )</tt> instead of <tt>if(foo)</tt>), <tt>myFunc( foo, bar, baz )</tt> instead of <tt>myFunc(foo,bar,baz)</tt>). No spaces after methods names (i.e. <tt>void myMethod(), myMethod( &quot;foo&quot; )</tt>)</li><li><b>Indentation</b>: Always use 4 space indents and <b>never</b> use tabs!</li><li><b>Blocks</b>: Always enclose with a new line brace.</li><li><b>Line wrapping</b>: Alway
 s use a 120-column line width for Java code and Javadoc.</li><li><b>Readingness</b>: Specify code grouping members, if needed. For instance in a Mojo class, you could have:<div class="source"><pre>public class MyMojo
+{
+    // ----------------------------------------------------------------------
+    // Mojo components
+    // ----------------------------------------------------------------------
+
+    /**
+     * Artifact factory.
+     *
+     * @component
+     */
+    private ArtifactFactory artifactFactory;
+
+    ...
+
+    // ----------------------------------------------------------------------
+    // Mojo parameters
+    // ----------------------------------------------------------------------
+
+    /**
+     * The POM.
+     *
+     * @parameter expression=&quot;${project}&quot;
+     * @required
+     */
+    private MavenProject project;
+
+    ...
+
+    // ----------------------------------------------------------------------
+    // Mojo options
+    // ----------------------------------------------------------------------
+    ...
+
+    // ----------------------------------------------------------------------
+    // Public methods
+    // ----------------------------------------------------------------------
+
+    /**
+     * {@inheritDoc}
+     */
+    public void execute()
+        throws MojoExecutionException
+    {
+      ...
+    }
+
+    // ----------------------------------------------------------------------
+    // Protected methods
+    // ----------------------------------------------------------------------
+    ...
+
+    // ----------------------------------------------------------------------
+    // Private methods
+    // ----------------------------------------------------------------------
+    ...
+
+    // ----------------------------------------------------------------------
+    // Static methods
+    // ----------------------------------------------------------------------
+    ...
+}</pre></div></li></ul><p>The following sections show how to set up the code style for Maven in IDEA and Eclipse. It is strongly preferred that patches use this style before they are applied.</p><div class="section"><h5>IntelliJ IDEA 4.5+<a name="IntelliJ_IDEA_4.5"></a></h5><p>Download <tt><a href="../../developers/maven-idea-codestyle.xml">maven-idea-codestyle.xml</a></tt> and copy it to <tt>~/.IntelliJIDEA/config/codestyles</tt> then restart IDEA. On Windows, try <tt>C:\Documents and Settings&lt;username&gt;\.IntelliJIDEA\config\codestyles</tt></p><p>After this, restart IDEA and open the settings to select the new code style.</p></div><div class="section"><h5>Eclipse 3.2+<a name="Eclipse_3.2"></a></h5><p>Download <tt><a href="../../developers/maven-eclipse-codestyle.xml">maven-eclipse-codestyle.xml</a></tt>.</p><p>After this, select Window &gt; Preferences, and open up the configuration for Java &gt; Code Style &gt; Code Formatter. Click on the button labeled Import... and
  select the file you downloaded. Give the style a name, and click OK.</p></div></div><div class="section"><h4><a name="Java_Code_Convention">Java Code Convention</a></h4><p>For consistency reasons, our Java code convention is mainly:</p><ul><li><b>Naming</b>: Constants (i.e. static final members) values should always be in upper case. Using short, descriptive names for classes and methods.</li><li><b>Organization</b>: Avoid using a lot of public inner classes. Prefer interfaces instead of default implementation.</li><li><b>Modifier</b>: Avoid using final modifier on all member variables and arguments. Prefer using private or protected member instead of public member.</li><li><b>Exceptions</b>: Throw meaningful exceptions to makes debugging and testing more easy.</li><li><b>Documentation</b>: Document public interfaces well, i.e. all non-trivial public and protected functions should include Javadoc that indicates what it does. <b>Note</b>: it is an ongoing convention for the 
 Maven Team.</li><li><b>Testing</b>: All non-trivial public classes should include corresponding unit or IT tests.</li></ul></div><div class="section"><h4><a name="JavaDoc_Convention">JavaDoc Convention</a></h4><p>TO BE DISCUSSED</p></div></div><div class="section"><h3><a name="XML">XML</a></h3><div class="section"><h4><a name="XML_Code_Style">XML Code Style</a></h4><p>The Maven style for XML files is mainly:</p><ul><li><b>Indentation</b>: Always use 2 space indents, unless you're wrapping a new XML tags line in which case you should indent 4 spaces.</li><li><b>Line Breaks</b>: Always use a new line with indentation for complex XML types and no line break for simple XML types. Always use a new line to separate XML sections or blocks, for instance:<div class="source"><pre>&lt;aTag&gt;
+  &lt;simpleType&gt;This is a simple type&lt;/simpleType&gt;
+
+  &lt;complexType&gt;
+    &lt;simpleType&gt;This is a complex type&lt;/simpleType&gt;
+  &lt;/complexType&gt;
+&lt;/aTag&gt;</pre></div><p>In some cases, adding comments could improve the readability of blocks, for instance:</p><div class="source"><pre>    &lt;!-- Simple XML documentation                                               --&gt;</pre></div><p>or</p><div class="source"><pre>    &lt;!-- ====================================================================== --&gt;
+    &lt;!-- Block documentation                                                    --&gt;
+    &lt;!-- ====================================================================== --&gt;</pre></div></li></ul></div><div class="section"><h4><a name="Generic_XML_Code_Convention">Generic XML Code Convention</a></h4><p>No generic code convention exists yet for XML files.</p></div><div class="section"><h4><a name="POM_Code_Convention">POM Code Convention</a></h4><p>The team has <a class="externalLink" href="http://www.nabble.com/-Proposal--Pom-Code-Style-(WAS-svn-commit%3A-r670264----maven-plugins-trunk-maven-site-plugin-pom.xml)-td18083228.html">voted</a> during the end of June 2008 to follow a specific POM convention to ordering POM elements. The consequence of this vote is that the <a class="externalLink" href="http://maven.apache.org/ref/current/maven-model/maven.html">Maven project descriptor</a> is <b>no more</b> considered as the reference for the ordering.</p><p>The following is the recommended ordering for all Maven POM files:</p><div class="source"><pre>&lt;project 
 xmlns=&quot;http://maven.apache.org/POM/4.0.0&quot; xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot; xsi:schemaLocation=&quot;http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd&quot;&gt;
+  &lt;modelVersion/&gt;
+
+  &lt;parent/&gt;
+
+  &lt;groupId/&gt;
+  &lt;artifactId/&gt;
+  &lt;version/&gt;
+  &lt;packaging/&gt;
+
+  &lt;name/&gt;
+  &lt;description/&gt;
+  &lt;url/&gt;
+  &lt;inceptionYear/&gt;
+  &lt;organization/&gt;
+  &lt;licenses/&gt;
+
+  &lt;developers/&gt;
+  &lt;contributors/&gt;
+
+  &lt;mailingLists/&gt;
+
+  &lt;prerequisites/&gt;
+
+  &lt;modules/&gt;
+
+  &lt;scm/&gt;
+  &lt;issueManagement/&gt;
+  &lt;ciManagement/&gt;
+  &lt;distributionManagement/&gt;
+
+  &lt;properties/&gt;
+
+  &lt;dependencyManagement/&gt;
+  &lt;dependencies/&gt;
+
+  &lt;repositories/&gt;
+  &lt;pluginRepositories/&gt;
+
+  &lt;build/&gt;
+
+  &lt;reporting/&gt;
+
+  &lt;profiles/&gt;
+&lt;/project&gt;</pre></div><p><b>Comments</b>:</p><ol style="list-style-type: decimal"><li>The &lt;project/&gt; element is always on one line.</li><li>The blocks are voluntary separated by a new line to improve the readingness.</li><li>The dependencies in &lt;dependencies/&gt; and &lt;dependencyManagement/&gt; tags have no specific ordering. Developers are free to choose the ordering, but grouping dependencies by topics (like groupId i.e. <tt>org.apache.maven</tt>) is a good practice.</li></ol><p><b>Note</b>: The team plans to create a Maven plugin with reorder and reformat goals (See <a class="externalLink" href="http://jira.codehaus.org/browse/MOJO-928">MOJO-928</a>).</p></div><div class="section"><h4><a name="XDOC_Code_Convention">XDOC Code Convention</a></h4><p>For consistency and readability reasons, XDOC files should respect:</p><ul><li><b>Metadata</b>: Always specify metadata in the &lt;properties/&gt; tag.</li><li><b>Sections</b>: Always use a new line with indentat
 ion for &lt;section/&gt; tags.</li></ul></div><div class="section"><h4><a name="FML_Code_Convention">FML Code Convention</a></h4><p>For readability reasons, FML files should respect:</p><ul><li><b>FAQ</b>: Always use a new line with indentation for &lt;faq/&gt; tags.</li></ul><!-- * {APT} Do we need any specific APT style/convention? --></div></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2002-2012
+              The Apache Software Foundation
+            
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/maven/trunk/content/developers/conventions/git.html
==============================================================================
--- websites/staging/maven/trunk/content/developers/conventions/git.html (added)
+++ websites/staging/maven/trunk/content/developers/conventions/git.html Mon Dec 10 08:17:24 2012
@@ -0,0 +1,280 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--
+ | Generated by Apache Maven Doxia at Dec 10, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Maven - Maven Git Convention</title>
+    <style type="text/css" media="all">
+      @import url("../../css/maven-base.css");
+      @import url("../../css/maven-theme.css");
+      @import url("../../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Olivier Lamy" />
+        <meta name="Date-Creation-yyyymmdd" content="20120912" />
+    <meta name="Date-Revision-yyyymmdd" content="20121210" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                              </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="../.././" id="bannerLeft">
+                                                <img src="../../images/apache-maven-project-2.png" alt="" />
+                </a>
+                        <span id="bannerRight">
+                                                <img src="../../images/maven-logo-2.gif" alt="" />
+                </span>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                   <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../../index.html">Maven</a>
+        &gt;
+        Maven Git Convention
+        </div>
+            <div class="xright">        
+                                    Last Published: 2012-12-10
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                   <h5>Main</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../index.html">Welcome</a>
+            </li>
+          </ul>
+                       <h5>Get Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../download.html">Download</a>
+            </li>
+                  <li class="none">
+                  <a href="../../docs/3.0.4/release-notes.html">Release Notes (3.0.4)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../docs/2.2.1/release-notes.html">Release Notes (2.2.1)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../docs/2.0.11/release-notes.html">Release Notes (2.0.11)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../license.html">License</a>
+            </li>
+          </ul>
+                       <h5>IDE Integration</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../eclipse-plugin.html">Eclipse</a>
+            </li>
+                  <li class="none">
+                  <a href="../../netbeans-module.html">NetBeans</a>
+            </li>
+          </ul>
+                       <h5>About Maven</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../what-is-maven.html">What is Maven?</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-features.html">Features</a>
+            </li>
+                  <li class="none">
+                  <a href="../../general.html">FAQ (official)</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/FAQs-1" class="externalLink">FAQ (unofficial)</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Maven Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../guides/index.html">Index (category)</a>
+            </li>
+                  <li class="none">
+                  <a href="../../run-maven/index.html">Running Maven</a>
+            </li>
+                                                                                                                                            <li class="collapsed">
+                  <a href="../../users/index.html">User Centre</a>
+                  </li>
+                                                                                                        <li class="collapsed">
+                  <a href="../../plugin-developers/index.html">Plugin Developer Centre</a>
+                  </li>
+                  <li class="none">
+                  <a href="../../repository/index.html">Maven Repository Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../../developers/index.html">Maven Developer Centre</a>
+            </li>
+                  <li class="none">
+                  <a href="../../articles.html">Books and Resources</a>
+            </li>
+                  <li class="none">
+                  <a href="http://docs.codehaus.org/display/MAVENUSER/Home" class="externalLink">Wiki</a>
+            </li>
+          </ul>
+                       <h5>Community</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../community.html">Community Overview</a>
+            </li>
+                  <li class="none">
+                  <a href="../../guides/development/guide-helping.html">How to Contribute</a>
+            </li>
+                  <li class="none">
+                  <a href="../../guides/mini/guide-maven-evangelism.html">Maven Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../../users/getting-help.html">Getting Help</a>
+            </li>
+                  <li class="none">
+                  <a href="../../issue-tracking.html">Issue Tracking</a>
+            </li>
+                  <li class="none">
+                  <a href="../../source-repository.html">Source Repository</a>
+            </li>
+                  <li class="none">
+                  <a href="../../team-list.html">The Maven Team</a>
+            </li>
+          </ul>
+                       <h5>Project Documentation</h5>
+                  <ul>
+                                                                                                                          <li class="collapsed">
+                  <a href="../../project-info.html">Project Information</a>
+                  </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../../doxia/index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../../index.html">Maven 2 & 3</a>
+            </li>
+                  <li class="none">
+                  <a href="../../pom/index.html">Parent POMs</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugin-tools/index.html">Plugin Tools</a>
+            </li>
+                  <li class="none">
+                  <a href="../../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../../images/logos/maven-feather.png"/>
+        </a>
+                       
+                               </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Maven Git Convention<a name="Maven_Git_Convention"></a></h2><p>This document describes how developers should use Git, our SCM.</p><div class="section"><h3>Git migration<a name="Git_migration"></a></h3><p>ETA of git migration is here: <a class="externalLink" href="https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration">https://cwiki.apache.org/confluence/display/MAVEN/Git+Migration</a></p></div><div class="section"><h3>Git Configuration<a name="Git_Configuration"></a></h3><p>TODO</p></div><div class="section"><h3><a name="Commit_Message_Template">Commit Message Template</a></h3><p>Commits should be focused on one issue at a time, because that makes it easier for others to review the commit.</p><p>A commit message should use this template:</p><div class="source"><pre>[ISSUE-1] &lt;&lt;Summary field from JIRA&gt;&gt;
+Submitted by: &lt;&lt;Name of non-committer&gt;&gt;
+
+o Comments</pre></div><p>Where:</p><ul><li><b>ISSUE-1</b> can be omitted if there was no relevant JIRA issue, though you are strongly encouraged to create one for significant changes.</li><li><b>Submitted by</b> only needs to be specified when a patch is being applied for a non-committer.</li><li><b>Comments</b> some optional words about the solution.</li></ul></div></div><div class="section"><h2>eg:<a name="eg:"></a></h2><div class="source"><pre>[MNG-1456] Added the foo to the bar
+Submitted by: Baz Bazman
+
+o Applied without change</pre></div><div class="section"><h3>Apply User Patch<a name="Apply_User_Patch"></a></h3><p>By default, the committer should apply the patch without any <b>major</b> modifications. In a second step, the committer could apply any changes as usual.</p></div><div class="section"><h3>Edit Commit Message<a name="Edit_Commit_Message"></a></h3><div><pre> git commit --amend to edit last commit comment</pre></div></div><div class="section"><h3>Workflow<a name="Workflow"></a></h3><p>Workflow for svn folks is something like :</p><div><pre> $ git pull
+ $ hack hack hack
+ $ git push
+ // fails, because someone else has already pushed to master
+ $ git pull
+ // this creates some merges
+ $ git push</pre></div><p>A more quiet workflow :</p><div><pre>$ git pull
+$ hack hack hack
+$ git push
+// fails, because someone else has already pushed to master
+$ git fetch
+// this moves 'origin/master'
+$ git rebase origin/master
+// this reapplies your local changes on top of origin/master
+$ git push</pre></div></div><div class="section"><h3>Other useful Git commands while developing<a name="Other_useful_Git_commands_while_developing"></a></h3><p>If you've done a chunk of work and you would like ditch your changes and start from scratch use this command to revert to the original checkout:</p><div><pre>$ git checkout .</pre></div><p>TODO .gitignore</p></div><div class="section"><h3>power-git checkout<a name="power-git_checkout"></a></h3><p>This checkout is typical for highly experienced git users, and may serve as inspiration for others; as usual the best way to learn is by doing. Sample shown for maven-surefire</p><p>Go to https://github.com/apache/maven-surefire and fork surefire to your own github account.</p><p>Starting with nothing (no existing clone)</p><div><pre>git clone https://github.com/&lt;youraccount&gt;/maven-surefire.git
+git remote add apache https://git-wip-us.apache.org/repos/asf/maven-surefire.git
+git remote add asfgithub https://github.com/apache/maven-surefire.git
+git config --add remote.asfgithub.fetch &quot;+refs/pull/*/head:refs/remotes/asfgithub/pr/*&quot;
+git fetch --all</pre></div><p>(You may consider adding --global to the git config statement above to always fetch pull requests for any remote named &quot;asfgithub&quot;)</p><p>In this setup, running &quot;git push&quot; will normally push to your personal github account. Furthermore, all pull requests from github are also fetched to your local clone, use</p><div><pre>gitk --all</pre></div><p>to try to make some sense of it all. This is an important command to understand! (gitk may need to be installed additionally)</p><p>If you're working on the master branch, you can do stuff like this:</p><div><pre>git push # your github account
+git push apache # the authorative apache repo</pre></div><p>Using your github account as a storage for half-finished work is excellent if you switch between multiple computers, always push to github before leaving your current computer and start by pulling at the next computer.</p><p>To merge a pull request</p><div><pre>git merge pr/10 # merge pull request number 10 from asf@github into master
+git push apache # upload to apache</pre></div><p>Or if you're comfortable with rebasing;</p><div><pre>
+git checkout pr/10
+git rebase apache/master
+git push apache</pre></div></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2002-2012
+              The Apache Software Foundation
+            
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>



Mime
View raw message