You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@asterixdb.apache.org by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org> on 2015/12/09 07:03:53 UTC
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/542
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
ASTERIXDB-1217: remove references to Google Code
Also make the Jekyll configuration a little more convenient.
Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
---
M _config.yml
M content/about.html
M content/community.html
M content/dev-setup.html
M content/download.html
M content/index.html
M content/pushing.html
M content/tools.html
M dev-setup.md
9 files changed, 134 insertions(+), 133 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site refs/changes/42/542/1
diff --git a/_config.yml b/_config.yml
index e3019e9..d81fe93 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,4 +1,4 @@
-url: https://asterixdb.incubator.apache.org/
+url: ""
name: "Apache AsterixDB"
@@ -13,6 +13,7 @@
ICS_DOWNLOAD_BASE_URL: "https://asterixdb.ics.uci.edu/download"
# Build settings
+destination: content
defaults:
-
scope:
diff --git a/content/about.html b/content/about.html
index 0f49df3..58e88db 100644
--- a/content/about.html
+++ b/content/about.html
@@ -7,16 +7,16 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+ <link rel="icon" href="favicon.ico">
<title>About AsterixDB</title>
<!-- Bootstrap core CSS -->
- <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+ <link href="css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
<div class="container theme-showcase" role="main">
<div class="masthead">
<p class="lead">
- <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+ <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
</p>
</div>
@@ -42,11 +42,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+ <a class="navbar-brand" href="index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+ <li><a href="download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -57,16 +57,16 @@
<li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.8.8-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
- <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+ <li><a href="about.html">About</a></li>
+ <li><a href="community.html">Community</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+ <li><a href="dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+ <li><a href="pushing.html">Pushing changes</a></li>
</ul>
</li>
</ul>
@@ -118,7 +118,7 @@
<p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
</div>
<div class="col-md-1 text-right">
- <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
</div>
</div>
</footer>
@@ -129,6 +129,6 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
</body>
</html>
diff --git a/content/community.html b/content/community.html
index 9ab8a30..7ef91e7 100644
--- a/content/community.html
+++ b/content/community.html
@@ -7,16 +7,16 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+ <link rel="icon" href="favicon.ico">
<title>Community</title>
<!-- Bootstrap core CSS -->
- <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+ <link href="css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
<div class="container theme-showcase" role="main">
<div class="masthead">
<p class="lead">
- <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+ <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
</p>
</div>
@@ -42,11 +42,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+ <a class="navbar-brand" href="index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+ <li><a href="download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -57,16 +57,16 @@
<li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.8.8-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
- <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+ <li><a href="about.html">About</a></li>
+ <li><a href="community.html">Community</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+ <li><a href="dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+ <li><a href="pushing.html">Pushing changes</a></li>
</ul>
</li>
</ul>
@@ -147,145 +147,145 @@
</thead>
<tbody>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/michael_carey.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/michael_carey.jpg" width="100" height="100" /></td>
<td>Michael Carey</td>
<td>UC Irvine</td>
<td>dtabass</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/till_westmann.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/till_westmann.jpg" width="100" height="100" /></td>
<td>Till Westmann</td>
<td>Couchbase</td>
<td>tillw</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/vinayak_borkar.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/vinayak_borkar.jpg" width="100" height="100" /></td>
<td>Vinayak Borkar</td>
<td>X15 Software</td>
<td>vborkar</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/vassilis_tsotras.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/vassilis_tsotras.jpg" width="100" height="100" /></td>
<td>Vassilis Tsotras</td>
<td>UC Riverside</td>
<td>tsotras</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/chen_li.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/chen_li.jpg" width="100" height="100" /></td>
<td>Chen Li</td>
<td>UC Irvine</td>
<td>chenli</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/yingyi_bu.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/yingyi_bu.jpg" width="100" height="100" /></td>
<td>Yingyi Bu</td>
<td>UC Irvine</td>
<td>yingyib</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/young_seok_kim.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/young_seok_kim.jpg" width="100" height="100" /></td>
<td>Young-Seok Kim</td>
<td>UC Irvine</td>
<td>kisskys</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/inci_cetindil.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/inci_cetindil.jpg" width="100" height="100" /></td>
<td>Inci Cetindil</td>
<td>UC Irvine</td>
<td>icetindil</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/raman_grover.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/raman_grover.jpg" width="100" height="100" /></td>
<td>Raman Grover</td>
<td>Microsoft Research</td>
<td>raman</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/pouria_pirzadeh.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/pouria_pirzadeh.jpg" width="100" height="100" /></td>
<td>Pouria Pirzadeh</td>
<td>UC Irvine</td>
<td>pouria</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/murtadha_hubail.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/murtadha_hubail.jpg" width="100" height="100" /></td>
<td>Murtadha Hubail</td>
<td>UC Irvine</td>
<td>mhubail</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/ian_maxon.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/ian_maxon.jpg" width="100" height="100" /></td>
<td>Ian Maxon</td>
<td>UC Irvine</td>
<td>imaxon</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/jianfeng_jia.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/jianfeng_jia.jpg" width="100" height="100" /></td>
<td>Jianfeng Jia</td>
<td>UC Irvine</td>
<td>jianfeng</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/taewoo_kim.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/taewoo_kim.jpg" width="100" height="100" /></td>
<td>Taewoo Kim</td>
<td>UC Irvine</td>
<td>wangsaeu</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/anonymous.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/anonymous.jpg" width="100" height="100" /></td>
<td>Cameron Samak</td>
<td>UC Irvine</td>
<td>csamak</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/sattam_alsubaiee.png" width="100" height="100" /></td>
+ <td><img src="/img/team/sattam_alsubaiee.png" width="100" height="100" /></td>
<td>Sattam Alsubaiee</td>
<td>KACST Saudi Arabia</td>
<td>salsubaiee</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/steven_jacobs.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/steven_jacobs.jpg" width="100" height="100" /></td>
<td>Steven Jacobs</td>
<td>UC Riverside</td>
<td>sjaco002</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/ildar_absalyamov.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/ildar_absalyamov.jpg" width="100" height="100" /></td>
<td>Ildar Absalyamov</td>
<td>UC Riverside</td>
<td>ildar</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/anonymous.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/anonymous.jpg" width="100" height="100" /></td>
<td>Preston Carman</td>
<td>UC Riverside</td>
<td>prestonc</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/abdullah_alamoudi.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/abdullah_alamoudi.jpg" width="100" height="100" /></td>
<td>Abdullah Alamoudi</td>
<td>Saudi Aramco</td>
<td>amoudi</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/zachary_heilbron.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/zachary_heilbron.jpg" width="100" height="100" /></td>
<td>Zach Heilbron</td>
<td>X15 Software</td>
<td>zheilbron</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/anonymous.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/anonymous.jpg" width="100" height="100" /></td>
<td>Markus Dreseler</td>
<td>HPI</td>
<td>mrks</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/keren_ouaknine.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/keren_ouaknine.jpg" width="100" height="100" /></td>
<td>Keren Ouaknine</td>
<td>Hebrew University</td>
<td>kereno</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/chris_hillery.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/chris_hillery.jpg" width="100" height="100" /></td>
<td>Chris Hillery</td>
<td>Couchbase</td>
<td>ceej</td>
@@ -307,12 +307,12 @@
</thead>
<tbody>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/eugenia_gabrielova.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/eugenia_gabrielova.jpg" width="100" height="100" /></td>
<td>Eugenia Gabrielova</td>
<td>UC Irvine</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/team/heri_ramampiaro.jpg" width="100" height="100" /></td>
+ <td><img src="/img/team/heri_ramampiaro.jpg" width="100" height="100" /></td>
<td>Heri Ramampiaro</td>
<td>NTNU Trondheim</td>
</tr>
@@ -332,7 +332,7 @@
<p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
</div>
<div class="col-md-1 text-right">
- <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
</div>
</div>
</footer>
@@ -343,6 +343,6 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
</body>
</html>
diff --git a/content/dev-setup.html b/content/dev-setup.html
index 00a4e16..502326a 100644
--- a/content/dev-setup.html
+++ b/content/dev-setup.html
@@ -7,16 +7,16 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+ <link rel="icon" href="favicon.ico">
<title>Contributing to AsterixDB</title>
<!-- Bootstrap core CSS -->
- <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+ <link href="css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
<div class="container theme-showcase" role="main">
<div class="masthead">
<p class="lead">
- <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+ <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
</p>
</div>
@@ -42,11 +42,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+ <a class="navbar-brand" href="index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+ <li><a href="download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -57,16 +57,16 @@
<li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.8.8-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
- <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+ <li><a href="about.html">About</a></li>
+ <li><a href="community.html">Community</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+ <li><a href="dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+ <li><a href="pushing.html">Pushing changes</a></li>
</ul>
</li>
</ul>
@@ -196,7 +196,8 @@
</li>
<li>Set up Eclipse code formatting rules
<ul>
- <li>Download files <a href="http://wiki.asterixdb.googlecode.com/git/AsterixCodeFormatProfile.xml">AsterixCodeFormatProfile.xml</a> <a href="http://wiki.asterixdb.googlecode.com/git/AsterixCleanupFormatProfile.xml">AsterixCleanupFormatProfile.xml</a></li>
+ <li>Download files <a href="https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCodeFormatProfile.xml">AsterixCodeFormatProfile.xml</a>
+ <a href="https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCleanupFormatProfile.xml">AsterixCleanupFormatProfile.xml</a></li>
<li>Import profiles into Eclipse
<ul>
<li>Preferences -> Java -> Code style -> Formatter -> Import -> Select AsterixCodeFormatProfile.xml</li>
@@ -273,7 +274,7 @@
<ol>
<li>
- <p>To work on (say) Asterix, first clone the Google Code repository (if you already have a local clone, great!).</p>
+ <p>To work on (say) Asterix, first clone the GitHub mirror or the ASF repository (if you already have a local clone, great!), e.g.</p>
<p>git clone https://github.com/apache/incubator-asterixdb</p>
</li>
@@ -290,17 +291,17 @@
<ol>
<li>
- <p>When you want to start working on a bug, feature, etc, first make a local <code>git</code> branch. Never work directly on <code>master</code>! <code>master</code> should always be a pure mirror of <code>origin/master</code>, ie, Google Code.</p>
+ <p>When you want to start working on a bug, feature, etc, first make a local <code>git</code> branch. Never work directly on
+ <code>master</code>! <code>master</code> should always be a pure mirror of <code>origin/master</code>, i.e., the GitHub mirror or the ASF repository.</p>
<pre><code> git checkout -b my_branch
</code></pre>
</li>
- <li>Make your changes, test them, etc. Feel free to <code>git commit</code> as often as you like.</li>
<li>
- <p><strong>Optional</strong>: If you like, you can push your branch up to Google Code, either to share it with others or as a backup. You may do this at whatever point in time you like.</p>
-
- <pre><code> git push origin my_branch
-</code></pre>
+ <p>Make your changes, test them, etc. Feel free to <code>git commit</code> as often as you like.</p>
+ </li>
+ <li>
+ <p><strong>Optional</strong>: If you like, you can push your branch up to another git repository (e.g. in your own GitHub account), either to share it with others or as a backup. You may do this at whatever point in time you like.</p>
</li>
<li>
<p>Every so often, you should update your local <code>master</code> mirror, and then merge that onto your working branch. This will prevent your branch from falling too far out of date, and ensure that your code review proposals will merge successfully with <code>master</code>. There are a number of ways to do this, but <code>git-gerrit</code> provides a convenience function:</p>
@@ -392,7 +393,7 @@
<p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
</div>
<div class="col-md-1 text-right">
- <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
</div>
</div>
</footer>
@@ -403,6 +404,6 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
</body>
</html>
diff --git a/content/download.html b/content/download.html
index af7c387..43f8024 100644
--- a/content/download.html
+++ b/content/download.html
@@ -7,16 +7,16 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+ <link rel="icon" href="favicon.ico">
<title>Download</title>
<!-- Bootstrap core CSS -->
- <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+ <link href="css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
<div class="container theme-showcase" role="main">
<div class="masthead">
<p class="lead">
- <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+ <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
</p>
</div>
@@ -42,11 +42,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+ <a class="navbar-brand" href="index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+ <li><a href="download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -57,16 +57,16 @@
<li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.8.8-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
- <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+ <li><a href="about.html">About</a></li>
+ <li><a href="community.html">Community</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+ <li><a href="dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+ <li><a href="pushing.html">Pushing changes</a></li>
</ul>
</li>
</ul>
@@ -193,7 +193,7 @@
<p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
</div>
<div class="col-md-1 text-right">
- <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
</div>
</div>
</footer>
@@ -204,6 +204,6 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
</body>
</html>
diff --git a/content/index.html b/content/index.html
index afc8f89..f41a21f 100644
--- a/content/index.html
+++ b/content/index.html
@@ -7,16 +7,16 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+ <link rel="icon" href="favicon.ico">
<title>Apache AsterixDB</title>
<!-- Bootstrap core CSS -->
- <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+ <link href="css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
<div class="container theme-showcase" role="main">
<div class="masthead">
<p class="lead">
- <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+ <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
</p>
</div>
@@ -42,11 +42,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+ <a class="navbar-brand" href="index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+ <li><a href="download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -57,16 +57,16 @@
<li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.8.8-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
- <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+ <li><a href="about.html">About</a></li>
+ <li><a href="community.html">Community</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+ <li><a href="dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+ <li><a href="pushing.html">Pushing changes</a></li>
</ul>
</li>
</ul>
@@ -231,9 +231,9 @@
</div>
<div class="col-md-6">
<h3 id="community-and-support">Community and Support</h3>
- <p>If you have any questions, please feel free to ask on our <a href="mailto:users@asterixdb.incubator.apache.org">users</a> mailing list, which you can subscribe to by sending an empty email to <a href="users-subscribe@asterixdb.incubator.apache.org">users-subscribe</a>. Check out the <a href="https://asterixdb.incubator.apache.org/community.html">Community</a> page for more details.</p>
+ <p>If you have any questions, please feel free to ask on our <a href="mailto:users@asterixdb.incubator.apache.org">users</a> mailing list, which you can subscribe to by sending an empty email to <a href="users-subscribe@asterixdb.incubator.apache.org">users-subscribe</a>. Check out the <a href="community.html">Community</a> page for more details.</p>
- <p>If you would like to know more about how to contribute to AsterixDB or any of its related components, head on over to the <a href="https://asterixdb.incubator.apache.org/dev-setup.html">Contributing</a> page to learn more.</p>
+ <p>If you would like to know more about how to contribute to AsterixDB or any of its related components, head on over to the <a href="dev-setup.html">Contributing</a> page to learn more.</p>
</div>
</div>
@@ -247,7 +247,7 @@
<p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
</div>
<div class="col-md-1 text-right">
- <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
</div>
</div>
</footer>
@@ -258,6 +258,6 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
</body>
</html>
diff --git a/content/pushing.html b/content/pushing.html
index e9eeaaf..c45fc8c 100644
--- a/content/pushing.html
+++ b/content/pushing.html
@@ -7,16 +7,16 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+ <link rel="icon" href="favicon.ico">
<title>Submitting Changes</title>
<!-- Bootstrap core CSS -->
- <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+ <link href="css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
<div class="container theme-showcase" role="main">
<div class="masthead">
<p class="lead">
- <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+ <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
</p>
</div>
@@ -42,11 +42,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+ <a class="navbar-brand" href="index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+ <li><a href="download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -57,16 +57,16 @@
<li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.8.8-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
- <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+ <li><a href="about.html">About</a></li>
+ <li><a href="community.html">Community</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+ <li><a href="dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+ <li><a href="pushing.html">Pushing changes</a></li>
</ul>
</li>
</ul>
@@ -146,7 +146,7 @@
<p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
</div>
<div class="col-md-1 text-right">
- <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
</div>
</div>
</footer>
@@ -157,6 +157,6 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
</body>
</html>
diff --git a/content/tools.html b/content/tools.html
index 92500b8..cd967b1 100644
--- a/content/tools.html
+++ b/content/tools.html
@@ -7,16 +7,16 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<meta name="description" content="">
<meta name="author" content="">
- <link rel="icon" href="https://asterixdb.incubator.apache.org/favicon.ico">
+ <link rel="icon" href="favicon.ico">
<title>Tools</title>
<!-- Bootstrap core CSS -->
- <link href="https://asterixdb.incubator.apache.org/css/bootstrap.min.css" rel="stylesheet">
+ <link href="css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap theme -->
<!-- Custom styles for this template -->
- <link href="https://asterixdb.incubator.apache.org/css/theme.css" rel="stylesheet">
+ <link href="css/theme.css" rel="stylesheet">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,7 +29,7 @@
<div class="container theme-showcase" role="main">
<div class="masthead">
<p class="lead">
- <a href="https://asterixdb.incubator.apache.org/index.html"><img src="https://asterixdb.incubator.apache.org/img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
+ <a href="index.html"><img src="img/asterixdb.png" style="height:75px; width:auto; vertical-align:bottom; margin-top:10px;"/></a>
</p>
</div>
@@ -42,11 +42,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="https://asterixdb.incubator.apache.org/index.html">Overview</a>
+ <a class="navbar-brand" href="index.html">Overview</a>
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li><a href="https://asterixdb.incubator.apache.org/download.html">Download</a></li>
+ <li><a href="download.html">Download</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Documentation<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
@@ -57,16 +57,16 @@
<li><a href="https://ci.apache.org/projects/asterixdb/index.html">Documentation for 0.8.8-SNAPSHOT <i class="fa fa-external-link fa-sm"></i></a></li>
</ul>
</li>
- <li><a href="https://asterixdb.incubator.apache.org/about.html">About</a></li>
- <li><a href="https://asterixdb.incubator.apache.org/community.html">Community</a></li>
+ <li><a href="about.html">About</a></li>
+ <li><a href="community.html">Community</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Contributing <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header">For New Contributors</li>
- <li><a href="https://asterixdb.incubator.apache.org/dev-setup.html">Development Setup</a></li>
+ <li><a href="dev-setup.html">Development Setup</a></li>
<li class="divider"></li>
<li class="dropdown-header">For Committers</li>
- <li><a href="https://asterixdb.incubator.apache.org/pushing.html">Pushing changes</a></li>
+ <li><a href="pushing.html">Pushing changes</a></li>
</ul>
</li>
</ul>
@@ -87,7 +87,7 @@
<h3 id="apache-tools">Apache Tools</h3>
<p>|———————————————————————————–|——————-|
-|<img src="https://asterixdb.incubator.apache.org//img/tools/maven.png" height="100" /> | |</p>
+|<img src="/img/tools/maven.png" height="100" /> | |</p>
<hr />
<h4 id="open-source-tools">Open Source Tools</h4>
@@ -95,11 +95,11 @@
<table class="table table-striped">
<tbody>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/tools/jenkins.png" height="100" /></td>
+ <td><img src="/img/tools/jenkins.png" height="100" /></td>
<td> </td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/tools/gerrit.png" height="100" /></td>
+ <td><img src="/img/tools/gerrit.png" height="100" /></td>
<td>Gerrit is used by the majority of developers as a staging repository for new changes and as a code review tool</td>
</tr>
</tbody>
@@ -112,11 +112,11 @@
<table class="table table-striped">
<tbody>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/tools/yourkit.png" height="100" /></td>
+ <td><img src="/img/tools/yourkit.png" height="100" /></td>
<td>YourKit whenever a hard to</td>
</tr>
<tr>
- <td><img src="https://asterixdb.incubator.apache.org//img/tools/intellij.png" height="100" /></td>
+ <td><img src="/img/tools/intellij.png" height="100" /></td>
<td> </td>
</tr>
</tbody>
@@ -135,7 +135,7 @@
<p>Apache AsterixDB, Apache, and the Apache feather logo are trademarks of the Apache Software Foundation</p>
</div>
<div class="col-md-1 text-right">
- <img src="https://asterixdb.incubator.apache.org/img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
+ <img src="img/egg-logo.png" style="height:auto; width:200px; vertical-align:bottom;"/>
</div>
</div>
</footer>
@@ -146,6 +146,6 @@
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="https://asterixdb.incubator.apache.org/js/bootstrap.min.js"></script>
+ <script src="js/bootstrap.min.js"></script>
</body>
</html>
diff --git a/dev-setup.md b/dev-setup.md
index 282d6f8..9ea4b2c 100644
--- a/dev-setup.md
+++ b/dev-setup.md
@@ -79,7 +79,8 @@
* Repeat this step to all projects which show a red X mark except "asterix-fuzzyjoin" and "asterix-transactions".
* It may be the case that only "asterix-algebra" and "asterix-runtime" will require these steps.
7. Set up Eclipse code formatting rules
-* Download files [AsterixCodeFormatProfile.xml](http://wiki.asterixdb.googlecode.com/git/AsterixCodeFormatProfile.xml) [AsterixCleanupFormatProfile.xml](http://wiki.asterixdb.googlecode.com/git/AsterixCleanupFormatProfile.xml)
+* Download files [AsterixCodeFormatProfile.xml](https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCodeFormatProfile.xml)
+ [AsterixCleanupFormatProfile.xml](https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCleanupFormatProfile.xml)
* Import profiles into Eclipse
* Preferences -> Java -> Code style -> Formatter -> Import -> Select AsterixCodeFormatProfile.xml
* Preferences -> Java -> Code style -> Clean up -> Import -> Select AsterixCleanupFormatProfile.xml
@@ -144,7 +145,7 @@
### Once-per-repository tasks
- 1. To work on (say) Asterix, first clone the Google Code repository (if you already have a local clone, great!).
+ 1. To work on (say) Asterix, first clone the GitHub mirror or the ASF repository (if you already have a local clone, great!), e.g.
git clone https://github.com/apache/incubator-asterixdb
@@ -157,16 +158,14 @@
## Making Changes - working method
- 1. When you want to start working on a bug, feature, etc, first make a local `git` branch. Never work directly on `master`! `master` should always be a pure mirror of `origin/master`, ie, Google Code.
-
+ 1. When you want to start working on a bug, feature, etc, first make a local `git` branch. Never work directly on
+ `master`! `master` should always be a pure mirror of `origin/master`, i.e., the GitHub mirror or the ASF repository.
git checkout -b my_branch
-
1. Make your changes, test them, etc. Feel free to `git commit` as often as you like.
- 1. **Optional**: If you like, you can push your branch up to Google Code, either to share it with others or as a backup. You may do this at whatever point in time you like.
- git push origin my_branch
+ 1. **Optional**: If you like, you can push your branch up to another git repository (e.g. in your own GitHub account), either to share it with others or as a backup. You may do this at whatever point in time you like.
1. Every so often, you should update your local `master` mirror, and then merge that onto your working branch. This will prevent your branch from falling too far out of date, and ensure that your code review proposals will merge successfully with `master`. There are a number of ways to do this, but `git-gerrit` provides a convenience function:
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
Patch Set 2:
Build Started https://asterix-jenkins.ics.uci.edu/job/asf-site/24/
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has submitted this change and it was merged.
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
ASTERIXDB-1217: remove references to Google Code
Also make the Jekyll configuration a little more convenient.
Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Reviewed-on: https://asterix-gerrit.ics.uci.edu/542
Reviewed-by: Ian Maxon <im...@apache.org>
---
M content/dev-setup.html
M dev-setup.md
2 files changed, 66 insertions(+), 75 deletions(-)
Approvals:
Ian Maxon: Looks good to me, approved
diff --git a/content/dev-setup.html b/content/dev-setup.html
index f3557d6..8fc70e3 100644
--- a/content/dev-setup.html
+++ b/content/dev-setup.html
@@ -140,34 +140,31 @@
<h3 id="steps">Steps</h3>
<ol>
- <li>Check out Hyracks and Asterix master in two folders via git in the command line. Assume that the path is <code>$HOME/workspace</code>.</li>
-</ol>
+ <li>
+ <p>Check out Hyracks and Asterix master in two folders via git in the command line. Assume that the path is <code>$HOME/workspace</code>.</p>
-<pre><code> git clone https://github.com/apache/incubator-asterixdb/
- git clone https://github.com/apache/incubator-asterixdb-hyracks/
-
-You will now have `$HOME/workspace/incubator-asterixdb/` and `$HOME/workspace/incubator-asterixdb-hyracks/`.
+ <pre><code> git clone https://github.com/apache/incubator-asterixdb/
+ git clone https://github.com/apache/incubator-asterixdb-hyracks/
</code></pre>
-<ol>
- <li>Go to the hyracks and install it’s artifacts to the local Maven repository by executing the following commands:</li>
-</ol>
+ <p>You will now have <code>$HOME/workspace/incubator-asterixdb/</code> and <code>$HOME/workspace/incubator-asterixdb-hyracks/</code>.</p>
+ </li>
+ <li>
+ <p>Go to the hyracks and install it’s artifacts to the local Maven repository by executing the following commands:</p>
-<pre><code> cd incubator-asterixdb-hyracks/
- mvn install -DskipTests
+ <pre><code> cd incubator-asterixdb-hyracks/
+ mvn install -DskipTests
</code></pre>
+ </li>
+ <li>
+ <p>Go to the asterixdb folder and perform the same action:</p>
-<ol>
- <li>Go to the asterixdb folder and perform the same action:</li>
-</ol>
-
-<pre><code> cd ../incubator-asterixdb/asterix-maven-plugins/
- mvn install -DskipTests
- cd ../
- mvn install -DskipTests
+ <pre><code> cd ../incubator-asterixdb/asterix-maven-plugins/
+ mvn install -DskipTests
+ cd ../
+ mvn install -DskipTests
</code></pre>
-
-<ol>
+ </li>
<li>In Eclipse, import hyracks as an existing Maven Project.
<ul>
<li><code>File -> Import -> Maven -> Existing Maven Projects -> Next</code></li>
@@ -200,7 +197,8 @@
</li>
<li>Set up Eclipse code formatting rules
<ul>
- <li>Download files <a href="http://wiki.asterixdb.googlecode.com/git/AsterixCodeFormatProfile.xml">AsterixCodeFormatProfile.xml</a> <a href="http://wiki.asterixdb.googlecode.com/git/AsterixCleanupFormatProfile.xml">AsterixCleanupFormatProfile.xml</a></li>
+ <li>Download files <a href="https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCodeFormatProfile.xml">AsterixCodeFormatProfile.xml</a>
+ <a href="https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCleanupFormatProfile.xml">AsterixCleanupFormatProfile.xml</a></li>
<li>Import profiles into Eclipse
<ul>
<li>Preferences -> Java -> Code style -> Formatter -> Import -> Select AsterixCodeFormatProfile.xml</li>
@@ -276,68 +274,62 @@
<h3 id="once-per-repository-tasks">Once-per-repository tasks</h3>
<ol>
- <li>To work on (say) Asterix, first clone the Google Code repository (if you already have a local clone, great!).</li>
+ <li>
+ <p>To work on (say) Asterix, first clone the GitHub mirror or the ASF repository (if you already have a local clone, great!), e.g.</p>
+
+ <p>git clone https://github.com/apache/incubator-asterixdb</p>
+ </li>
+ <li>
+ <p><code>cd</code> into the clone repo directory, and then run the following command to create the “gerrit” remote.</p>
+
+ <p>git gerrit init</p>
+ </li>
</ol>
-
-<pre><code> git clone https://github.com/apache/incubator-asterixdb
-</code></pre>
-
-<ol>
- <li><code>cd</code> into the clone repo directory, and then run the following command to create the “gerrit” remote.</li>
-</ol>
-
-<pre><code> git gerrit init
-</code></pre>
<hr />
<h2 id="making-changes---working-method">Making Changes - working method</h2>
<ol>
- <li>When you want to start working on a bug, feature, etc, first make a local <code>git</code> branch. Never work directly on <code>master</code>! <code>master</code> should always be a pure mirror of <code>origin/master</code>, ie, Google Code.</li>
-</ol>
+ <li>
+ <p>When you want to start working on a bug, feature, etc, first make a local <code>git</code> branch. Never work directly on
+ <code>master</code>! <code>master</code> should always be a pure mirror of <code>origin/master</code>, i.e., the GitHub mirror or the ASF repository.</p>
-<pre><code> git checkout -b my_branch
+ <pre><code> git checkout -b my_branch
</code></pre>
+ </li>
+ <li>
+ <p>Make your changes, test them, etc. Feel free to <code>git commit</code> as often as you like.</p>
+ </li>
+ <li>
+ <p><strong>Optional</strong>: If you like, you can push your branch up to another git repository (e.g. in your own GitHub account), either to share it with others or as a backup. You may do this at whatever point in time you like.</p>
+ </li>
+ <li>
+ <p>Every so often, you should update your local <code>master</code> mirror, and then merge that onto your working branch. This will prevent your branch from falling too far out of date, and ensure that your code review proposals will merge successfully with <code>master</code>. There are a number of ways to do this, but <code>git-gerrit</code> provides a convenience function:</p>
-<ol>
- <li>Make your changes, test them, etc. Feel free to <code>git commit</code> as often as you like.</li>
- <li><strong>Optional</strong>: If you like, you can push your branch up to Google Code, either to share it with others or as a backup. You may do this at whatever point in time you like.</li>
-</ol>
-
-<pre><code> git push origin my_branch
+ <pre><code> git gerrit update
</code></pre>
+ </li>
+ <li>
+ <p>When you are ready to submit changes for code review, first ensure that you have committed everything locally that is necessary (<code>git status</code> should report “nothing to commit, working directory clean”). This is also a good time to update (see step 4). Then run:</p>
-<ol>
- <li>Every so often, you should update your local <code>master</code> mirror, and then merge that onto your working branch. This will prevent your branch from falling too far out of date, and ensure that your code review proposals will merge successfully with <code>master</code>. There are a number of ways to do this, but <code>git-gerrit</code> provides a convenience function:</li>
-</ol>
-
-<pre><code> git gerrit update
+ <pre><code> git gerrit submit
</code></pre>
-
-<ol>
- <li>When you are ready to submit changes for code review, first ensure that you have committed everything locally that is necessary (<code>git status</code> should report “nothing to commit, working directory clean”). This is also a good time to update (see step 4). Then run:</li>
-</ol>
-
-<pre><code> git gerrit submit
-</code></pre>
-
-<ol>
+ </li>
<li>This will pop open your editor to invite you to create a good commit message. This will be the single commit message which will be the only one to appear in the project’s master git history. Take the time to make it clear. The editor will contain the log messages of everything you committed on your branch as a reminder, but generally you will want to delete all this and replace it with a comprehensive message. Also: As noted in the initial message, the last line of the buffer will contain a <code>Change-Id</code> field. Do not delete that line! It is used by Gerrit to identify this particular merge proposal.</li>
- <li>When you save your commit message, git-gerrit will push all of the changes from your working branch up to Gerrit. Assuming no errors, you should see output similar to the following:</li>
-</ol>
+ <li>
+ <p>When you save your commit message, git-gerrit will push all of the changes from your working branch up to Gerrit. Assuming no errors, you should see output similar to the following:</p>
-<pre><code> remote: Resolving deltas: 100% (1/1)
- remote: Processing changes: new: 1, refs: 1, done
- remote:
- remote: New Changes:
- remote: http://fulliautomatix.ics.uci.edu:8443/30
- remote:
- To ssh://ceej@fulliautomatix.ics.uci.edu:29418/ceej-gerrit-test
- * [new branch] HEAD -> refs/for/master
+ <pre><code> remote: Resolving deltas: 100% (1/1)
+ remote: Processing changes: new: 1, refs: 1, done
+ remote:
+ remote: New Changes:
+ remote: http://fulliautomatix.ics.uci.edu:8443/30
+ remote:
+ To ssh://ceej@fulliautomatix.ics.uci.edu:29418/ceej-gerrit-test
+ * [new branch] HEAD -> refs/for/master
</code></pre>
-
-<ol>
+ </li>
<li>That URL under “New Changes” is your code review! Send it to others to request reviews.</li>
<li>If you get any negative code reviews and need to make changes, you can just repeat steps 2 - 6 of the working method. Your local branch will still have all the history you put there, if you need to revert changes or look back and see what you did, etc.</li>
<li>When you repeat step 6, you will notice two things: First, git-gerrit keeps the change message for you, including the Change-Id, so you don’t have to re-invent it every time. Second, the output from <code>git gerrit submit</code> will not include the URL of the review this time. I’m not sure why; I wish it did. But if you re-visit the old URL in your browser, you should see an additional “Patch Set” containing your revised changes for people to review.</li>
diff --git a/dev-setup.md b/dev-setup.md
index 282d6f8..9ea4b2c 100644
--- a/dev-setup.md
+++ b/dev-setup.md
@@ -79,7 +79,8 @@
* Repeat this step to all projects which show a red X mark except "asterix-fuzzyjoin" and "asterix-transactions".
* It may be the case that only "asterix-algebra" and "asterix-runtime" will require these steps.
7. Set up Eclipse code formatting rules
-* Download files [AsterixCodeFormatProfile.xml](http://wiki.asterixdb.googlecode.com/git/AsterixCodeFormatProfile.xml) [AsterixCleanupFormatProfile.xml](http://wiki.asterixdb.googlecode.com/git/AsterixCleanupFormatProfile.xml)
+* Download files [AsterixCodeFormatProfile.xml](https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCodeFormatProfile.xml)
+ [AsterixCleanupFormatProfile.xml](https://cwiki.apache.org/confluence/download/attachments/61322291/AsterixCleanupFormatProfile.xml)
* Import profiles into Eclipse
* Preferences -> Java -> Code style -> Formatter -> Import -> Select AsterixCodeFormatProfile.xml
* Preferences -> Java -> Code style -> Clean up -> Import -> Select AsterixCleanupFormatProfile.xml
@@ -144,7 +145,7 @@
### Once-per-repository tasks
- 1. To work on (say) Asterix, first clone the Google Code repository (if you already have a local clone, great!).
+ 1. To work on (say) Asterix, first clone the GitHub mirror or the ASF repository (if you already have a local clone, great!), e.g.
git clone https://github.com/apache/incubator-asterixdb
@@ -157,16 +158,14 @@
## Making Changes - working method
- 1. When you want to start working on a bug, feature, etc, first make a local `git` branch. Never work directly on `master`! `master` should always be a pure mirror of `origin/master`, ie, Google Code.
-
+ 1. When you want to start working on a bug, feature, etc, first make a local `git` branch. Never work directly on
+ `master`! `master` should always be a pure mirror of `origin/master`, i.e., the GitHub mirror or the ASF repository.
git checkout -b my_branch
-
1. Make your changes, test them, etc. Feel free to `git commit` as often as you like.
- 1. **Optional**: If you like, you can push your branch up to Google Code, either to share it with others or as a backup. You may do this at whatever point in time you like.
- git push origin my_branch
+ 1. **Optional**: If you like, you can push your branch up to another git repository (e.g. in your own GitHub account), either to share it with others or as a backup. You may do this at whatever point in time you like.
1. Every so often, you should update your local `master` mirror, and then merge that onto your working branch. This will prevent your branch from falling too far out of date, and ensure that your code review proposals will merge successfully with `master`. There are a number of ways to do this, but `git-gerrit` provides a convenience function:
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 3
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Till Westmann (Code Review)" <do...@asterixdb.incubator.apache.org>.
Hello Ian Maxon,
I'd like you to reexamine a change. Please visit
https://asterix-gerrit.ics.uci.edu/542
to look at the new patch set (#2).
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
ASTERIXDB-1217: remove references to Google Code
Also make the Jekyll configuration a little more convenient.
Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
---
M content/dev-setup.html
M dev-setup.md
2 files changed, 66 insertions(+), 75 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/incubator-asterixdb-site refs/changes/42/542/2
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
Patch Set 1:
Build Started https://asterix-jenkins.ics.uci.edu/job/asf-site/21/
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
Patch Set 1:
Build Failed
https://asterix-jenkins.ics.uci.edu/job/asf-site/21/ : FAILURE (skipped)
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 1
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Ian Maxon (Code Review)" <do...@asterixdb.incubator.apache.org>.
Ian Maxon has posted comments on this change.
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No
Change in incubator-asterixdb-site[asf-site]: ASTERIXDB-1217: remove references to Google Code
Posted by "Jenkins (Code Review)" <do...@asterixdb.incubator.apache.org>.
Jenkins has posted comments on this change.
Change subject: ASTERIXDB-1217: remove references to Google Code
......................................................................
Patch Set 2:
Build Successful
https://asterix-jenkins.ics.uci.edu/job/asf-site/24/ : SUCCESS (skipped)
--
To view, visit https://asterix-gerrit.ics.uci.edu/542
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I3a451b90ae2dbf8bcff23bf3cd9902d7b51e4ec9
Gerrit-PatchSet: 2
Gerrit-Project: incubator-asterixdb-site
Gerrit-Branch: asf-site
Gerrit-Owner: Till Westmann <ti...@apache.org>
Gerrit-Reviewer: Ian Maxon <im...@apache.org>
Gerrit-Reviewer: Jenkins <je...@fulliautomatix.ics.uci.edu>
Gerrit-HasComments: No