helix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ka...@apache.org
Subject [2/2] git commit: [HELIX-358] Update website to reflect graduation
Date Fri, 17 Jan 2014 17:57:26 GMT
[HELIX-358] Update website to reflect graduation


Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/ed3de1e5
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/ed3de1e5
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/ed3de1e5

Branch: refs/heads/master
Commit: ed3de1e51df7553dbe68b2e85b175f68f926fba2
Parents: 027eea2
Author: Kanak Biscuitwala <kanak@apache.org>
Authored: Thu Jan 16 18:22:51 2014 -0800
Committer: Kanak Biscuitwala <kanak@apache.org>
Committed: Thu Jan 16 18:28:01 2014 -0800

----------------------------------------------------------------------
 README.md                                       | 19 ++--
 .../TestClusterStatusMonitorLifecycle.java      | 98 ++++++++++++--------
 recipes/rabbitmq-consumer-group/README.md       |  2 +-
 .../src/site/markdown/Building.md               |  4 +-
 .../src/site/markdown/Quickstart.md             |  8 +-
 .../0.6.1-incubating/src/site/markdown/index.md |  2 +-
 .../src/site/markdown/recipes/lock_manager.md   |  4 +-
 .../markdown/recipes/rabbitmq_consumer_group.md |  6 +-
 .../recipes/rsync_replicated_file_store.md      |  4 +-
 .../site/markdown/recipes/service_discovery.md  |  4 +-
 .../site/markdown/recipes/task_dag_execution.md |  4 +-
 .../src/site/markdown/tutorial_messaging.md     |  2 +-
 .../src/site/markdown/tutorial_propstore.md     |  2 +-
 website/0.6.1-incubating/src/site/site.xml      | 10 +-
 .../src/site/xdoc/download.xml.vm               |  2 +-
 .../src/site/markdown/Building.md               |  4 +-
 .../src/site/markdown/Quickstart.md             |  8 +-
 .../0.6.2-incubating/src/site/markdown/index.md |  2 +-
 .../src/site/markdown/recipes/lock_manager.md   |  4 +-
 .../markdown/recipes/rabbitmq_consumer_group.md |  6 +-
 .../recipes/rsync_replicated_file_store.md      |  4 +-
 .../site/markdown/recipes/service_discovery.md  |  4 +-
 .../site/markdown/recipes/task_dag_execution.md |  4 +-
 .../src/site/markdown/tutorial_admin.md         | 10 +-
 .../src/site/markdown/tutorial_messaging.md     |  2 +-
 .../src/site/markdown/tutorial_propstore.md     |  2 +-
 .../src/site/markdown/tutorial_yaml.md          |  2 +-
 website/0.6.2-incubating/src/site/site.xml      | 10 +-
 .../src/site/xdoc/download.xml.vm               |  2 +-
 .../src/site/markdown/Building.md               |  4 +-
 .../src/site/markdown/Quickstart.md             |  8 +-
 .../0.7.0-incubating/src/site/markdown/index.md |  2 +-
 .../src/site/markdown/recipes/lock_manager.md   |  4 +-
 .../markdown/recipes/rabbitmq_consumer_group.md |  6 +-
 .../recipes/rsync_replicated_file_store.md      |  4 +-
 .../site/markdown/recipes/service_discovery.md  |  4 +-
 .../site/markdown/recipes/task_dag_execution.md |  4 +-
 .../markdown/recipes/user_def_rebalancer.md     | 16 ++--
 .../src/site/markdown/tutorial_accessors.md     | 12 +--
 .../src/site/markdown/tutorial_admin.md         | 10 +-
 .../src/site/markdown/tutorial_messaging.md     |  2 +-
 .../src/site/markdown/tutorial_propstore.md     |  2 +-
 .../markdown/tutorial_user_def_rebalancer.md    |  4 +-
 .../src/site/markdown/tutorial_yaml.md          |  2 +-
 website/0.7.0-incubating/src/site/site.xml      | 10 +-
 .../src/site/xdoc/download.xml.vm               |  2 +-
 website/src/site/apt/releasing.apt              | 22 ++---
 website/src/site/markdown/index.md              | 18 ++--
 .../src/site/markdown/involved/contribdocs.md   |  4 +-
 website/src/site/markdown/sources.md            |  6 +-
 website/src/site/site.xml                       |  6 +-
 website/src/site/xdoc/download.xml.vm           |  2 +-
 website/trunk/src/site/markdown/Building.md     |  4 +-
 website/trunk/src/site/markdown/Quickstart.md   |  8 +-
 website/trunk/src/site/markdown/index.md        |  2 +-
 .../src/site/markdown/recipes/lock_manager.md   |  4 +-
 .../markdown/recipes/rabbitmq_consumer_group.md |  6 +-
 .../recipes/rsync_replicated_file_store.md      |  4 +-
 .../site/markdown/recipes/service_discovery.md  |  4 +-
 .../site/markdown/recipes/task_dag_execution.md |  4 +-
 .../markdown/recipes/user_def_rebalancer.md     | 16 ++--
 .../src/site/markdown/tutorial_accessors.md     | 12 +--
 .../trunk/src/site/markdown/tutorial_admin.md   | 10 +-
 .../src/site/markdown/tutorial_messaging.md     |  2 +-
 .../src/site/markdown/tutorial_propstore.md     |  2 +-
 .../markdown/tutorial_user_def_rebalancer.md    |  4 +-
 .../trunk/src/site/markdown/tutorial_yaml.md    |  2 +-
 website/trunk/src/site/site.xml                 | 10 +-
 website/trunk/src/site/xdoc/download.xml.vm     |  2 +-
 69 files changed, 252 insertions(+), 233 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 014e0ad..95cd2cd 100644
--- a/README.md
+++ b/README.md
@@ -17,23 +17,21 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-Apache Incubator
+Apache Helix
 ---------------
-Helix is now part of Apache Incubator. 
+Helix is part of the Apache Software Foundation.
 
-Project page: http://incubator.apache.org/projects/helix.html
+Documentation: http://helix.apache.org/
 
-Documentation: http://helix.incubator.apache.org/
-
-Mailing list: http://helix.incubator.apache.org/mail-lists.html
+Mailing list: http://helix.apache.org/mail-lists.html
 
 ### Build
 
 mvn clean install package -DskipTests
 
 
-WHAT IS HELIX
---------------
+### What is Helix?
+
 Helix is a generic cluster management framework used for automatic management of partitioned, replicated and distributed resources hosted on a cluster of nodes. Helix provides the following features: 
 
 1. Automatic assignment of resource/partition to nodes
@@ -46,10 +44,9 @@ Helix is a generic cluster management framework used for automatic management of
 -----
   
 
-Build Informations
-------------------
+### Building the Website
 
-To deploy web site to Apache infrastructure: sh ./deploySite.sh -Dusername=uid -Dpassword=pwd (-DskipTests if you don't want to run units tests)
+To deploy the web site to Apache infrastructure: sh website/deploySite.sh -Dusername=uid -Dpassword=pwd (-DskipTests if you don't want to run units tests)
 uid is your asf id, pwd is the password
 
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
index 65d60fb..e4fde8f 100644
--- a/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
+++ b/helix-core/src/test/java/org/apache/helix/monitoring/TestClusterStatusMonitorLifecycle.java
@@ -1,5 +1,24 @@
 package org.apache.helix.monitoring;
 
+/*
+ * 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.
+ */
+
 import java.io.IOException;
 import java.util.Date;
 
@@ -10,7 +29,6 @@ import javax.management.MalformedObjectNameException;
 
 import org.apache.helix.HelixDataAccessor;
 import org.apache.helix.TestHelper;
-import org.apache.helix.integration.TestDistributedCMMain;
 import org.apache.helix.integration.ZkIntegrationTestBase;
 import org.apache.helix.integration.manager.ClusterDistributedController;
 import org.apache.helix.integration.manager.MockParticipantManager;
@@ -24,25 +42,25 @@ import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase{
+public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase {
 
   MockParticipantManager[] _participants;
   ClusterDistributedController[] _controllers;
   String _controllerClusterName;
   String _clusterNamePrefix;
   String _firstClusterName;
-  
+
   final int n = 5;
   final int clusterNb = 10;
-    
+
   @BeforeClass
   public void beforeClass() throws Exception {
     String className = TestHelper.getTestClassName();
     String methodName = TestHelper.getTestMethodName();
     _clusterNamePrefix = className + "_" + methodName;
 
-    System.out
-        .println("START " + _clusterNamePrefix + " at " + new Date(System.currentTimeMillis()));
+    System.out.println("START " + _clusterNamePrefix + " at "
+        + new Date(System.currentTimeMillis()));
 
     // setup 10 clusters
     for (int i = 0; i < clusterNb; i++) {
@@ -62,7 +80,7 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase{
     // setup controller cluster
     _controllerClusterName = "CONTROLLER_" + _clusterNamePrefix;
     TestHelper.setupCluster("CONTROLLER_" + _clusterNamePrefix, ZK_ADDR, 0, // controller
-                                                                           // port
+                                                                            // port
         "controller", // participant name prefix
         _clusterNamePrefix, // resource name prefix
         1, // resources
@@ -125,9 +143,9 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase{
             _firstClusterName));
     Assert.assertTrue(result, "first cluster NOT in ideal state");
   }
-  
+
   @AfterClass
-  public void afterClass(){
+  public void afterClass() {
     System.out.println("Cleaning up...");
     for (int i = 0; i < 5; i++) {
       boolean result =
@@ -144,13 +162,13 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase{
     System.out.println("END " + _clusterNamePrefix + " at " + new Date(System.currentTimeMillis()));
 
   }
-  
+
   class ParticipantMonitorListener extends ClusterMBeanObserver {
-    
+
     int _nMbeansUnregistered = 0;
     int _nMbeansRegistered = 0;
-    public ParticipantMonitorListener(String domain)
-        throws InstanceNotFoundException, IOException,
+
+    public ParticipantMonitorListener(String domain) throws InstanceNotFoundException, IOException,
         MalformedObjectNameException, NullPointerException {
       super(domain);
     }
@@ -158,73 +176,75 @@ public class TestClusterStatusMonitorLifecycle extends ZkIntegrationTestBase{
     @Override
     public void onMBeanRegistered(MBeanServerConnection server,
         MBeanServerNotification mbsNotification) {
-      _nMbeansRegistered ++;
+      _nMbeansRegistered++;
     }
 
     @Override
     public void onMBeanUnRegistered(MBeanServerConnection server,
         MBeanServerNotification mbsNotification) {
       _nMbeansUnregistered++;
-    }}
-  
+    }
+  }
+
   @Test
-  public void testClusterStatusMonitorLifecycle() throws InstanceNotFoundException, MalformedObjectNameException, NullPointerException, IOException, InterruptedException{
+  public void testClusterStatusMonitorLifecycle() throws InstanceNotFoundException,
+      MalformedObjectNameException, NullPointerException, IOException, InterruptedException {
     ParticipantMonitorListener listener = new ParticipantMonitorListener("ClusterStatus");
-    
+
     int nMbeansUnregistered = listener._nMbeansUnregistered;
     int nMbeansRegistered = listener._nMbeansRegistered;
-    
+
     _participants[0].disconnect();
 
     // participant goes away. should be no change
     Thread.sleep(1000);
     Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered);
     Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered);
-    
-    HelixDataAccessor accessor = _participants[n-1].getHelixDataAccessor();
-    String firstControllerName = accessor.getProperty(accessor.keyBuilder().controllerLeader()).getId();
-    
+
+    HelixDataAccessor accessor = _participants[n - 1].getHelixDataAccessor();
+    String firstControllerName =
+        accessor.getProperty(accessor.keyBuilder().controllerLeader()).getId();
+
     ClusterDistributedController firstController = null;
-    for(ClusterDistributedController controller : _controllers)
-    {
-      if(controller.getInstanceName().equals(firstControllerName))
-      {
+    for (ClusterDistributedController controller : _controllers) {
+      if (controller.getInstanceName().equals(firstControllerName)) {
         firstController = controller;
       }
     }
     firstController.disconnect();
     Thread.sleep(1000);
-    
+
     // 1 cluster status monitor and 1 resource monitor
     Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2);
     Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 2);
-    
+
     String instanceName = "localhost0_" + (12918 + 0);
     _participants[0] = new MockParticipantManager(ZK_ADDR, _firstClusterName, instanceName);
     _participants[0].syncStart();
-    
+
     // participant goes back. should be no change
     Thread.sleep(1000);
     Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2);
     Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 2);
-    
+
     // Add a resource, one more mbean registered
     ClusterSetup setupTool = new ClusterSetup(ZK_ADDR);
     IdealState idealState = accessor.getProperty(accessor.keyBuilder().idealStates("TestDB00"));
-    
-    setupTool.addResourceToCluster(_firstClusterName, "TestDB1", idealState.getNumPartitions(), "MasterSlave");
-    setupTool.rebalanceResource(_firstClusterName, "TestDB1", Integer.parseInt(idealState.getReplicas()));
-    
+
+    setupTool.addResourceToCluster(_firstClusterName, "TestDB1", idealState.getNumPartitions(),
+        "MasterSlave");
+    setupTool.rebalanceResource(_firstClusterName, "TestDB1",
+        Integer.parseInt(idealState.getReplicas()));
+
     Thread.sleep(1000);
     Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2);
     Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 3);
-    
+
     // remove resource, no change
     setupTool.dropResourceFromCluster(_firstClusterName, "TestDB1");
     Thread.sleep(1000);
     Assert.assertTrue(nMbeansUnregistered == listener._nMbeansUnregistered - 2);
     Assert.assertTrue(nMbeansRegistered == listener._nMbeansRegistered - 3);
-    
-    
+
   }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/recipes/rabbitmq-consumer-group/README.md
----------------------------------------------------------------------
diff --git a/recipes/rabbitmq-consumer-group/README.md b/recipes/rabbitmq-consumer-group/README.md
index 8224c6a..0eac7f4 100644
--- a/recipes/rabbitmq-consumer-group/README.md
+++ b/recipes/rabbitmq-consumer-group/README.md
@@ -42,4 +42,4 @@ cd target/rsync-replicated-file-system-pkg/bin
 
 ```
 
-See [rsync_replicated_file_store](http://helix.incubator.apache.org/recipes/rsync_replicated_file_store.html) for more information
+See [rsync_replicated_file_store](http://helix.apache.org/recipes/rsync_replicated_file_store.html) for more information

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/Building.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/Building.md b/website/0.6.1-incubating/src/site/markdown/Building.md
index b0890ba..31d84d7 100644
--- a/website/0.6.1-incubating/src/site/markdown/Building.md
+++ b/website/0.6.1-incubating/src/site/markdown/Building.md
@@ -25,8 +25,8 @@ Build Instructions
 Requirements: JDK 1.6+, Maven 2.0.8+
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.1-incubating
 mvn install package -DskipTests
 ```

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/Quickstart.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/Quickstart.md b/website/0.6.1-incubating/src/site/markdown/Quickstart.md
index 6cdd864..b025342 100644
--- a/website/0.6.1-incubating/src/site/markdown/Quickstart.md
+++ b/website/0.6.1-incubating/src/site/markdown/Quickstart.md
@@ -28,8 +28,8 @@ First, let\'s get Helix. Either build it, or download it.
 ### Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.1-incubating
 mvn install package -DskipTests
 cd helix-core/target/helix-core-pkg/bin # This folder contains all the scripts used in following sections
@@ -56,7 +56,7 @@ Helix provides command line interfaces to set up the cluster and view the cluste
 If you built the code:
 
 ```
-cd helix/incubator-helix/helix-core/target/helix-core-pkg/bin
+cd helix/helix/helix-core/target/helix-core-pkg/bin
 ```
 
 If you downloaded the release package, extract it.
@@ -78,7 +78,7 @@ You can observe the components working together in this demo, which does the fol
 ### Run the Demo
 
 ```
-cd helix/incubator-helix/helix-core/target/helix-core-pkg/bin
+cd helix/helix/helix-core/target/helix-core-pkg/bin
 ./quickstart.sh
 ```
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/index.md b/website/0.6.1-incubating/src/site/markdown/index.md
index b201c32..cb23547 100644
--- a/website/0.6.1-incubating/src/site/markdown/index.md
+++ b/website/0.6.1-incubating/src/site/markdown/index.md
@@ -35,7 +35,7 @@ under the License.
 
 [Tutorial](./Tutorial.html)
 
-[Javadocs](http://helix.incubator.apache.org/javadocs/0.6.1-incubating/index.html)
+[Javadocs](http://helix.apache.org/javadocs/0.6.1-incubating/index.html)
 
 ### Recipes
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md b/website/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md
index 0f3206f..f088029 100644
--- a/website/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md
+++ b/website/0.6.1-incubating/src/site/markdown/recipes/lock_manager.md
@@ -48,8 +48,8 @@ To quickly see this working run the `lock-manager-demo` script where 12 locks ar
 This version starts multiple threads within the same process to simulate a multi node deployment. Try the long version to get a better idea of how it works.
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.1-incubating
 mvn clean install package -DskipTests
 cd recipes/distributed-lock-manager/target/distributed-lock-manager-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md b/website/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
index a78f92e..5c3cc3f 100644
--- a/website/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
+++ b/website/0.6.1-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
@@ -50,8 +50,8 @@ We showcase how such a dynamic application can be developed using Helix. Even th
 ### Try It
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.1-incubating
 mvn clean install package -DskipTests
 cd recipes/rabbitmq-consumer-group/bin
@@ -138,7 +138,7 @@ In any terminal press CTRL^C and notice that Helix detects the consumer failure
 
 ### How does this work?
 
-Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
+Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
 
 #### Cluster Setup
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md b/website/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
index 3060493..00dce6d 100644
--- a/website/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
+++ b/website/0.6.1-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
@@ -34,8 +34,8 @@ Near-Realtime Rsync Replicated File System
 
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.1-incubating
 cd recipes/rsync-replicated-file-system/
 mvn clean install package -DskipTests

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md b/website/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md
index 6ece922..7f216fa 100644
--- a/website/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md
+++ b/website/0.6.1-incubating/src/site/markdown/recipes/service_discovery.md
@@ -82,8 +82,8 @@ Helix provides these additional features compared to other implementations avail
 ### Checkout and Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.1-incubating
 mvn clean install package -DskipTests
 cd recipes/service-discovery/target/service-discovery-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md b/website/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md
index 4a38028..6df64d8 100644
--- a/website/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md
+++ b/website/0.6.1-incubating/src/site/markdown/recipes/task_dag_execution.md
@@ -79,8 +79,8 @@ See http://redis.io/topics/quickstart on how to install redis server
 Start redis e.g:
 ./redis-server --port 6379
 
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout helix-0.6.1-incubating
 cd recipes/task-execution
 mvn clean install package -DskipTests

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/tutorial_messaging.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/tutorial_messaging.md b/website/0.6.1-incubating/src/site/markdown/tutorial_messaging.md
index 589f321..3dedb91 100644
--- a/website/0.6.1-incubating/src/site/markdown/tutorial_messaging.md
+++ b/website/0.6.1-incubating/src/site/markdown/tutorial_messaging.md
@@ -64,5 +64,5 @@ int sentMessageCount = messagingService.sendAndWait(recipientCriteria,
     requestBackupUriRequest, responseHandler, timeout);
 ```
 
-See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.incubator.apache.org/javadocs/0.6.1-incubating/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more information.
+See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.apache.org/javadocs/0.6.1-incubating/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more information.
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/markdown/tutorial_propstore.md
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/markdown/tutorial_propstore.md b/website/0.6.1-incubating/src/site/markdown/tutorial_propstore.md
index 50f4fab..a4d9cf5 100644
--- a/website/0.6.1-incubating/src/site/markdown/tutorial_propstore.md
+++ b/website/0.6.1-incubating/src/site/markdown/tutorial_propstore.md
@@ -28,4 +28,4 @@ It is common that an application needs support for distributed, shared data stru
 
 While you could use ZooKeeper directly, Helix supports caching the data with a write-through cache. This is far more efficient than reading from ZooKeeper for every access.
 
-See [HelixManager.getHelixPropertyStore](http://helix.incubator.apache.org/javadocs/0.6.1-incubating/reference/org/apache/helix/store/package-summary.html) for details.
+See [HelixManager.getHelixPropertyStore](http://helix.apache.org/javadocs/0.6.1-incubating/reference/org/apache/helix/store/package-summary.html) for details.

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/site.xml
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/site.xml b/website/0.6.1-incubating/src/site/site.xml
index 857dd01..48e398e 100644
--- a/website/0.6.1-incubating/src/site/site.xml
+++ b/website/0.6.1-incubating/src/site/site.xml
@@ -18,7 +18,7 @@
 <project name="Apache Helix 0.6.1-incubating">
   <bannerLeft>
     <src>../images/helix-logo.jpg</src>
-    <href>http://helix.incubator.apache.org/</href>
+    <href>http://helix.apache.org/</href>
   </bannerLeft>
   <bannerRight>
     <src>../images/feather_small.gif</src>
@@ -54,8 +54,8 @@
     </head>
 
     <breadcrumbs position="left">
-      <item name="Apache Helix" href="http://helix.incubator.apache.org/"/>
-      <item name="Release 0.6.1-incubating" href="http://helix.incubator.apache.org/0.6.1-incubating-docs/"/>
+      <item name="Apache Helix" href="http://helix.apache.org/"/>
+      <item name="Release 0.6.1-incubating" href="http://helix.apache.org/0.6.1-incubating-docs/"/>
     </breadcrumbs>
 
     <links>
@@ -71,7 +71,7 @@
     <menu name="Hands-On">
       <item name="Quick Start" href="./Quickstart.html"/>
       <item name="Tutorial" href="./Tutorial.html"/>
-      <item name="Javadocs" href="http://helix.incubator.apache.org/javadocs/0.6.1-incubating"/>
+      <item name="Javadocs" href="http://helix.apache.org/javadocs/0.6.1-incubating"/>
     </menu>
 
     <menu name="Recipes">
@@ -109,7 +109,7 @@
       <highlightJs>false</highlightJs>
       <brand>
         <name>Apache Helix</name>
-        <href>http://helix.incubator.apache.org</href>
+        <href>http://helix.apache.org</href>
       </brand>
       <slogan>A cluster management framework for partitioned and replicated distributed resources</slogan>
       <bottomNav>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.1-incubating/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/website/0.6.1-incubating/src/site/xdoc/download.xml.vm b/website/0.6.1-incubating/src/site/xdoc/download.xml.vm
index 2fc59c3..f18682f 100644
--- a/website/0.6.1-incubating/src/site/xdoc/download.xml.vm
+++ b/website/0.6.1-incubating/src/site/xdoc/download.xml.vm
@@ -25,7 +25,7 @@ under the License.
 
   <properties>
     <title>Apache Helix Downloads</title>
-    <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
+    <author email="dev@helix.apache.org">Apache Helix Documentation Team</author>
   </properties>
 
   <body>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/Building.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/Building.md b/website/0.6.2-incubating/src/site/markdown/Building.md
index fd16376..e00433a 100644
--- a/website/0.6.2-incubating/src/site/markdown/Building.md
+++ b/website/0.6.2-incubating/src/site/markdown/Building.md
@@ -25,8 +25,8 @@ Build Instructions
 Requirements: JDK 1.6+, Maven 2.0.8+
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 mvn install package -DskipTests
 ```

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/Quickstart.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/Quickstart.md b/website/0.6.2-incubating/src/site/markdown/Quickstart.md
index a85edfb..56a6b91 100644
--- a/website/0.6.2-incubating/src/site/markdown/Quickstart.md
+++ b/website/0.6.2-incubating/src/site/markdown/Quickstart.md
@@ -32,8 +32,8 @@ First, let\'s get Helix. Either build it, or download it.
 ### Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 mvn install package -DskipTests
 cd helix-core/target/helix-core-pkg/bin # This folder contains all the scripts used in following sections
@@ -60,7 +60,7 @@ Helix provides command line interfaces to set up the cluster and view the cluste
 If you built the code:
 
 ```
-cd helix/incubator-helix/helix-core/target/helix-core-pkg/bin
+cd helix/helix/helix-core/target/helix-core-pkg/bin
 ```
 
 If you downloaded the release package, extract it.
@@ -82,7 +82,7 @@ You can observe the components working together in this demo, which does the fol
 ### Run the Demo
 
 ```
-cd helix/incubator-helix/helix-core/target/helix-core-pkg/bin
+cd helix/helix/helix-core/target/helix-core-pkg/bin
 ./quickstart.sh
 ```
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/index.md b/website/0.6.2-incubating/src/site/markdown/index.md
index 2214ff4..7e28025 100644
--- a/website/0.6.2-incubating/src/site/markdown/index.md
+++ b/website/0.6.2-incubating/src/site/markdown/index.md
@@ -35,7 +35,7 @@ under the License.
 
 [Tutorial](./Tutorial.html)
 
-[Javadocs](http://helix.incubator.apache.org/javadocs/0.6.2-incubating/index.html)
+[Javadocs](http://helix.apache.org/javadocs/0.6.2-incubating/index.html)
 
 ### Recipes
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/recipes/lock_manager.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/recipes/lock_manager.md b/website/0.6.2-incubating/src/site/markdown/recipes/lock_manager.md
index 5cf30f1..ae70004 100644
--- a/website/0.6.2-incubating/src/site/markdown/recipes/lock_manager.md
+++ b/website/0.6.2-incubating/src/site/markdown/recipes/lock_manager.md
@@ -48,8 +48,8 @@ To quickly see this working run the `lock-manager-demo` script where 12 locks ar
 This version starts multiple threads within the same process to simulate a multi node deployment. Try the long version to get a better idea of how it works.
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 mvn clean install package -DskipTests
 cd recipes/distributed-lock-manager/target/distributed-lock-manager-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md b/website/0.6.2-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
index 16aad98..51c3149 100644
--- a/website/0.6.2-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
+++ b/website/0.6.2-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
@@ -50,8 +50,8 @@ We showcase how such a dynamic application can be developed using Helix. Even th
 ### Try It
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 mvn clean install package -DskipTests
 cd recipes/rabbitmq-consumer-group/bin
@@ -138,7 +138,7 @@ In any terminal press CTRL^C and notice that Helix detects the consumer failure
 
 ### How does this work?
 
-Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
+Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
 
 #### Cluster Setup
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md b/website/0.6.2-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
index 5b3d6db..c5a05c5 100644
--- a/website/0.6.2-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
+++ b/website/0.6.2-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
@@ -34,8 +34,8 @@ Near-Realtime Rsync Replicated File System
 
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 cd recipes/rsync-replicated-file-system/
 mvn clean install package -DskipTests

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/recipes/service_discovery.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/recipes/service_discovery.md b/website/0.6.2-incubating/src/site/markdown/recipes/service_discovery.md
index d8f0132..d85ac75 100644
--- a/website/0.6.2-incubating/src/site/markdown/recipes/service_discovery.md
+++ b/website/0.6.2-incubating/src/site/markdown/recipes/service_discovery.md
@@ -82,8 +82,8 @@ Helix provides these additional features compared to other implementations avail
 ### Checkout and Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 mvn clean install package -DskipTests
 cd recipes/service-discovery/target/service-discovery-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/recipes/task_dag_execution.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/recipes/task_dag_execution.md b/website/0.6.2-incubating/src/site/markdown/recipes/task_dag_execution.md
index f6bfde5..f033d8c 100644
--- a/website/0.6.2-incubating/src/site/markdown/recipes/task_dag_execution.md
+++ b/website/0.6.2-incubating/src/site/markdown/recipes/task_dag_execution.md
@@ -79,8 +79,8 @@ See http://redis.io/topics/quickstart on how to install redis server
 Start redis e.g:
 ./redis-server --port 6379
 
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout helix-0.6.2-incubating
 cd recipes/task-execution
 mvn clean install package -DskipTests

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/tutorial_admin.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/tutorial_admin.md b/website/0.6.2-incubating/src/site/markdown/tutorial_admin.md
index 01ddb85..8347ab4 100644
--- a/website/0.6.2-incubating/src/site/markdown/tutorial_admin.md
+++ b/website/0.6.2-incubating/src/site/markdown/tutorial_admin.md
@@ -30,7 +30,7 @@ Helix provides a set of admin APIs for cluster management operations. They are s
 * REST Interface via helix-admin-webapp
 
 ### Java API
-See interface [_org.apache.helix.HelixAdmin_](http://helix.incubator.apache.org/javadocs/0.6.2-incubating/reference/org/apache/helix/HelixAdmin.html)
+See interface [_org.apache.helix.HelixAdmin_](http://helix.apache.org/javadocs/0.6.2-incubating/reference/org/apache/helix/HelixAdmin.html)
 
 ### Command Line Interface
 The command line tool comes with helix-core package:
@@ -38,8 +38,8 @@ The command line tool comes with helix-core package:
 Get the command line tool:
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 ./build
 cd helix-core/target/helix-core-pkg/bin
@@ -108,8 +108,8 @@ All other commands have this form:
 The REST interface comes wit helix-admin-webapp package:
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.6.2-incubating
 ./build
 cd helix-admin-webapp/target/helix-admin-webapp-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/tutorial_messaging.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/tutorial_messaging.md b/website/0.6.2-incubating/src/site/markdown/tutorial_messaging.md
index 15eb99f..76aee29 100644
--- a/website/0.6.2-incubating/src/site/markdown/tutorial_messaging.md
+++ b/website/0.6.2-incubating/src/site/markdown/tutorial_messaging.md
@@ -67,4 +67,4 @@ int sentMessageCount = messagingService.sendAndWait(recipientCriteria,
     requestBackupUriRequest, responseHandler, timeout);
 ```
 
-See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.incubator.apache.org/javadocs/0.6.2-incubating/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more information.
+See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.apache.org/javadocs/0.6.2-incubating/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more information.

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/tutorial_propstore.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/tutorial_propstore.md b/website/0.6.2-incubating/src/site/markdown/tutorial_propstore.md
index a681f92..4d0fed5 100644
--- a/website/0.6.2-incubating/src/site/markdown/tutorial_propstore.md
+++ b/website/0.6.2-incubating/src/site/markdown/tutorial_propstore.md
@@ -31,4 +31,4 @@ It is common that an application needs support for distributed, shared data stru
 
 While you could use ZooKeeper directly, Helix supports caching the data with a write-through cache. This is far more efficient than reading from ZooKeeper for every access.
 
-See [HelixManager.getHelixPropertyStore](http://helix.incubator.apache.org/javadocs/0.6.2-incubating/reference/org/apache/helix/store/package-summary.html) for details.
+See [HelixManager.getHelixPropertyStore](http://helix.apache.org/javadocs/0.6.2-incubating/reference/org/apache/helix/store/package-summary.html) for details.

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/markdown/tutorial_yaml.md
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/markdown/tutorial_yaml.md b/website/0.6.2-incubating/src/site/markdown/tutorial_yaml.md
index 4660afa..1e4772e 100644
--- a/website/0.6.2-incubating/src/site/markdown/tutorial_yaml.md
+++ b/website/0.6.2-incubating/src/site/markdown/tutorial_yaml.md
@@ -82,7 +82,7 @@ participants: # list of nodes that can serve replicas (optional if dynamic joini
 Using a file like the one above, the cluster can be set up either with the command line:
 
 ```
-incubator-helix/helix-core/target/helix-core/pkg/bin/YAMLClusterSetup.sh localhost:2199 lock-manager-config.yaml
+helix/helix-core/target/helix-core/pkg/bin/YAMLClusterSetup.sh localhost:2199 lock-manager-config.yaml
 ```
 
 or with code:

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/site.xml
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/site.xml b/website/0.6.2-incubating/src/site/site.xml
index f4af045..4063a2f 100644
--- a/website/0.6.2-incubating/src/site/site.xml
+++ b/website/0.6.2-incubating/src/site/site.xml
@@ -18,7 +18,7 @@
 <project name="Apache Helix">
   <bannerLeft>
     <src>../images/helix-logo.jpg</src>
-    <href>http://helix.incubator.apache.org/</href>
+    <href>http://helix.apache.org/</href>
   </bannerLeft>
   <bannerRight>
     <src>../images/feather_small.gif</src>
@@ -54,8 +54,8 @@
     </head>
 
     <breadcrumbs position="left">
-      <item name="Apache Helix" href="http://helix.incubator.apache.org/"/>
-      <item name="Release 0.6.2-incubating" href="http://helix.incubator.apache.org/0.6.2-incubating-docs/"/>
+      <item name="Apache Helix" href="http://helix.apache.org/"/>
+      <item name="Release 0.6.2-incubating" href="http://helix.apache.org/0.6.2-incubating-docs/"/>
     </breadcrumbs>
 
     <links>
@@ -71,7 +71,7 @@
     <menu name="Hands-On">
       <item name="Quick Start" href="./Quickstart.html"/>
       <item name="Tutorial" href="./Tutorial.html"/>
-      <item name="Javadocs" href="http://helix.incubator.apache.org/javadocs/0.6.2-incubating"/>
+      <item name="Javadocs" href="http://helix.apache.org/javadocs/0.6.2-incubating"/>
     </menu>
 
     <menu name="Recipes">
@@ -109,7 +109,7 @@
       <highlightJs>false</highlightJs>
       <brand>
         <name>Apache Helix</name>
-        <href>http://helix.incubator.apache.org</href>
+        <href>http://helix.apache.org</href>
       </brand>
       <slogan>A cluster management framework for partitioned and replicated distributed resources</slogan>
       <bottomNav>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.6.2-incubating/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/website/0.6.2-incubating/src/site/xdoc/download.xml.vm b/website/0.6.2-incubating/src/site/xdoc/download.xml.vm
index dbc7513..c2e9264 100644
--- a/website/0.6.2-incubating/src/site/xdoc/download.xml.vm
+++ b/website/0.6.2-incubating/src/site/xdoc/download.xml.vm
@@ -25,7 +25,7 @@ under the License.
 
   <properties>
     <title>Apache Helix Downloads</title>
-    <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
+    <author email="dev@helix.apache.org">Apache Helix Documentation Team</author>
   </properties>
 
   <body>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/Building.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/Building.md b/website/0.7.0-incubating/src/site/markdown/Building.md
index 48cf597..8e1ec84 100644
--- a/website/0.7.0-incubating/src/site/markdown/Building.md
+++ b/website/0.7.0-incubating/src/site/markdown/Building.md
@@ -25,8 +25,8 @@ Build Instructions
 Requirements: JDK 1.6+, Maven 2.0.8+
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 mvn install package -DskipTests
 ```

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/Quickstart.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/Quickstart.md b/website/0.7.0-incubating/src/site/markdown/Quickstart.md
index 5381a2b..942b386 100644
--- a/website/0.7.0-incubating/src/site/markdown/Quickstart.md
+++ b/website/0.7.0-incubating/src/site/markdown/Quickstart.md
@@ -32,8 +32,8 @@ First, let\'s get Helix. Either build it, or download it.
 ### Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 mvn install package -DskipTests
 # This folder contains quickstart.sh and start-helix-participant.sh
@@ -63,7 +63,7 @@ Helix provides command line interfaces to set up the cluster and view the cluste
 If you built the code:
 
 ```
-cd helix/incubator-helix/helix-examples/target/helix-examples-pkg/bin
+cd helix/helix/helix-examples/target/helix-examples-pkg/bin
 ```
 
 If you downloaded the release package, extract it.
@@ -85,7 +85,7 @@ You can observe the components working together in this demo, which does the fol
 ### Run the Demo
 
 ```
-cd helix/incubator-helix/helix-examples/target/helix-examples-pkg/bin
+cd helix/helix/helix-examples/target/helix-examples-pkg/bin
 ./quickstart.sh
 ```
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/index.md b/website/0.7.0-incubating/src/site/markdown/index.md
index b625fd7..205244f 100644
--- a/website/0.7.0-incubating/src/site/markdown/index.md
+++ b/website/0.7.0-incubating/src/site/markdown/index.md
@@ -35,7 +35,7 @@ under the License.
 
 [Tutorial](./Tutorial.html)
 
-[Javadocs](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/index.html)
+[Javadocs](http://helix.apache.org/javadocs/0.7.0-incubating/index.html)
 
 ### Recipes
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/recipes/lock_manager.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/recipes/lock_manager.md b/website/0.7.0-incubating/src/site/markdown/recipes/lock_manager.md
index 34950d2..6762cc5 100644
--- a/website/0.7.0-incubating/src/site/markdown/recipes/lock_manager.md
+++ b/website/0.7.0-incubating/src/site/markdown/recipes/lock_manager.md
@@ -48,8 +48,8 @@ To quickly see this working run the `lock-manager-demo` script where 12 locks ar
 This version starts multiple threads within the same process to simulate a multi node deployment. Try the long version to get a better idea of how it works.
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 mvn clean install package -DskipTests
 cd recipes/distributed-lock-manager/target/distributed-lock-manager-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md b/website/0.7.0-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
index 58f4a9e..a316c69 100644
--- a/website/0.7.0-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
+++ b/website/0.7.0-incubating/src/site/markdown/recipes/rabbitmq_consumer_group.md
@@ -50,8 +50,8 @@ We showcase how such a dynamic application can be developed using Helix. Even th
 ### Try It
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 mvn clean install package -DskipTests
 cd recipes/rabbitmq-consumer-group/bin
@@ -138,7 +138,7 @@ In any terminal press CTRL^C and notice that Helix detects the consumer failure
 
 ### How does this work?
 
-Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
+Find the entire code [here](https://git-wip-us.apache.org/repos/asf?p=helix.git;a=tree;f=recipes/rabbitmq-consumer-group/src/main/java/org/apache/helix/recipes/rabbitmq).
 
 #### Cluster Setup
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md b/website/0.7.0-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
index 9e26f96..5701f10 100644
--- a/website/0.7.0-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
+++ b/website/0.7.0-incubating/src/site/markdown/recipes/rsync_replicated_file_store.md
@@ -34,8 +34,8 @@ Near-Realtime Rsync Replicated File System
 
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 cd recipes/rsync-replicated-file-system/
 mvn clean install package -DskipTests

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/recipes/service_discovery.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/recipes/service_discovery.md b/website/0.7.0-incubating/src/site/markdown/recipes/service_discovery.md
index ebe44cc..406c5f2 100644
--- a/website/0.7.0-incubating/src/site/markdown/recipes/service_discovery.md
+++ b/website/0.7.0-incubating/src/site/markdown/recipes/service_discovery.md
@@ -82,8 +82,8 @@ Helix provides these additional features compared to other implementations avail
 ### Checkout and Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 mvn clean install package -DskipTests
 cd recipes/service-discovery/target/service-discovery-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/recipes/task_dag_execution.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/recipes/task_dag_execution.md b/website/0.7.0-incubating/src/site/markdown/recipes/task_dag_execution.md
index 15c46a3..345c7c6 100644
--- a/website/0.7.0-incubating/src/site/markdown/recipes/task_dag_execution.md
+++ b/website/0.7.0-incubating/src/site/markdown/recipes/task_dag_execution.md
@@ -79,8 +79,8 @@ See http://redis.io/topics/quickstart on how to install redis server
 Start redis e.g:
 ./redis-server --port 6379
 
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout helix-0.7.0-incubating
 cd recipes/task-execution
 mvn clean install package -DskipTests

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/recipes/user_def_rebalancer.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/recipes/user_def_rebalancer.md b/website/0.7.0-incubating/src/site/markdown/recipes/user_def_rebalancer.md
index 3cabb2f..3819916 100644
--- a/website/0.7.0-incubating/src/site/markdown/recipes/user_def_rebalancer.md
+++ b/website/0.7.0-incubating/src/site/markdown/recipes/user_def_rebalancer.md
@@ -24,9 +24,9 @@ Helix is able to compute node preferences and state assignments automatically us
 
 The YAML file below fully defines the cluster and the locks. A lock can be in one of two states: locked and unlocked. Transitions can happen in either direction, and the locked is preferred. A resource in this example is the entire collection of locks to distribute. A partition is mapped to a lock; in this case that means there are 12 locks. These 12 locks will be distributed across 3 nodes. The constraints indicate that only one replica of a lock can be in the locked state at any given time. These locks can each only have a single holder, defined by a replica count of 1.
 
-Notice the rebalancer section of the definition. The mode is set to USER_DEFINED and the class name refers to the plugged-in rebalancer implementation that inherits from [HelixRebalancer](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html). This implementation is called whenever the state of the cluster changes, as is the case when participants are added or removed from the system.
+Notice the rebalancer section of the definition. The mode is set to USER_DEFINED and the class name refers to the plugged-in rebalancer implementation that inherits from [HelixRebalancer](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html). This implementation is called whenever the state of the cluster changes, as is the case when participants are added or removed from the system.
 
-Location: `incubator-helix/recipes/user-defined-rebalancer/src/main/resources/lock-manager-config.yaml`
+Location: `helix/recipes/user-defined-rebalancer/src/main/resources/lock-manager-config.yaml`
 
 ```
 clusterName: lock-manager-custom-rebalancer # unique name for the cluster
@@ -93,9 +93,9 @@ YAMLClusterSetup.YAMLClusterConfig config = setup.setupCluster(input);
 ```
 
 ### Write a Rebalancer
-Below is a full implementation of a rebalancer that extends [HelixRebalancer](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html). In this case, it simply throws out the previous resource assignment, computes the target node for as many partition replicas as can hold a lock in the LOCKED state (in this example, one), and assigns them the LOCKED state (which is at the head of the state preference list). Clearly a more robust implementation would likely examine the current ideal state to maintain current assignments, and the full state list to handle models more complicated than this one. However, for a simple lock holder implementation, this is sufficient.
+Below is a full implementation of a rebalancer that extends [HelixRebalancer](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html). In this case, it simply throws out the previous resource assignment, computes the target node for as many partition replicas as can hold a lock in the LOCKED state (in this example, one), and assigns them the LOCKED state (which is at the head of the state preference list). Clearly a more robust implementation would likely examine the current ideal state to maintain current assignments, and the full state list to handle models more complicated than this one. However, for a simple lock holder implementation, this is sufficient.
 
-Location: `incubator-helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockManagerRebalancer.java`
+Location: `helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockManagerRebalancer.java`
 
 ```
 @Override
@@ -159,7 +159,7 @@ public ResourceAssignment computeResourceMapping(RebalancerConfig rebalancerConf
 ### Start up the Participants
 Here is a lock class based on the newly defined lock-unlock state model so that the participant can receive callbacks on state transitions.
 
-Location: `incubator-helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/Lock.java`
+Location: `helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/Lock.java`
 
 ```
 public class Lock extends StateModel {
@@ -183,7 +183,7 @@ public class Lock extends StateModel {
 
 Here is the factory to make the Lock class accessible.
 
-Location: `incubator-helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockFactory.java`
+Location: `helix/recipes/user-rebalanced-lock-manager/src/main/java/org/apache/helix/userdefinedrebalancer/LockFactory.java`
 
 ```
 public class LockFactory extends StateModelFactory<Lock> {
@@ -216,8 +216,8 @@ controllerManager =
 ### Try It Out
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 mvn clean install package -DskipTests
 cd recipes/user-defined-rebalancer/target/user-defined-rebalancer-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/tutorial_accessors.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/tutorial_accessors.md b/website/0.7.0-incubating/src/site/markdown/tutorial_accessors.md
index ee01cfb..769ee70 100644
--- a/website/0.7.0-incubating/src/site/markdown/tutorial_accessors.md
+++ b/website/0.7.0-incubating/src/site/markdown/tutorial_accessors.md
@@ -25,7 +25,7 @@ under the License.
 
 Helix constructs follow a logical hierarchy. A cluster contains participants, and serve logical resources. Each resource can be divided into partitions, which themselves can be replicated. Helix now supports configuring and modifying clusters programmatically in a hierarchical way using logical accessors.
 
-[Click here](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/api/accessor/package-summary.html) for the Javadocs of the accessors.
+[Click here](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/api/accessor/package-summary.html) for the Javadocs of the accessors.
 
 ### An Example
 
@@ -42,13 +42,13 @@ ParticipantConfig participantConfig = new ParticipantConfig.Builder(participantI
 #### Configure a Resource
 
 ##### RebalancerContext
-A Resource is essentially a combination of a RebalancerContext and a UserConfig. A [RebalancerContext](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/RebalancerContext.html) consists of all the key properties required to rebalance a resource, including how it is partitioned and replicated, and what state model it follows. Most Helix resources will make use of a [PartitionedRebalancerContext](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/PartitionedRebalancerContext.html), which is a RebalancerContext for resources that are partitioned.
+A Resource is essentially a combination of a RebalancerContext and a UserConfig. A [RebalancerContext](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/RebalancerContext.html) consists of all the key properties required to rebalance a resource, including how it is partitioned and replicated, and what state model it follows. Most Helix resources will make use of a [PartitionedRebalancerContext](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/PartitionedRebalancerContext.html), which is a RebalancerContext for resources that are partitioned.
 
 Recall that there are four [rebalancing modes](./tutorial_rebalance.html) that Helix provides, and so Helix also provides the following subclasses for PartitionedRebalancerContext:
 
-* [FullAutoRebalancerContext](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/FullAutoRebalancerContext.html) for FULL_AUTO mode.
-* [SemiAutoRebalancerContext](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/SemiAutoRebalancerContext.html) for SEMI_AUTO mode. This class allows a user to specify "preference lists" to indicate where each partition should ideally be served
-* [CustomRebalancerContext](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/CustomRebalancerContext.html) for CUSTOMIZED mode. This class allows a user tp specify "preference maps" to indicate the location and state for each partition replica.
+* [FullAutoRebalancerContext](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/FullAutoRebalancerContext.html) for FULL_AUTO mode.
+* [SemiAutoRebalancerContext](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/SemiAutoRebalancerContext.html) for SEMI_AUTO mode. This class allows a user to specify "preference lists" to indicate where each partition should ideally be served
+* [CustomRebalancerContext](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/CustomRebalancerContext.html) for CUSTOMIZED mode. This class allows a user tp specify "preference maps" to indicate the location and state for each partition replica.
 
 Helix also supports arbitrary subclasses of PartitionedRebalancerContext and even arbitrary implementations of RebalancerContext for applications that need a user-defined approach for rebalancing. For more, see [User-Defined Rebalancing](./tutorial_user_def_rebalancer.html)
 
@@ -87,7 +87,7 @@ clusterAccessor.createCluster(clusterConfig);
 
 ### Create, Read, Update, and Delete
 
-Note that you don't have to specify the entire cluster beforehand! Helix provides a ClusterAccessor, ParticipantAccessor, and ResourceAccessor to allow changing as much or as little of the cluster as needed on the fly. You can add a resource or participant to a cluster, reconfigure a resource, participant, or cluster, remove components from the cluster, and more. See the [Javadocs](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/api/accessor/package-summary.html) to see all that the accessor classes can do.
+Note that you don't have to specify the entire cluster beforehand! Helix provides a ClusterAccessor, ParticipantAccessor, and ResourceAccessor to allow changing as much or as little of the cluster as needed on the fly. You can add a resource or participant to a cluster, reconfigure a resource, participant, or cluster, remove components from the cluster, and more. See the [Javadocs](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/api/accessor/package-summary.html) to see all that the accessor classes can do.
 
 #### Delta Classes
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/tutorial_admin.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/tutorial_admin.md b/website/0.7.0-incubating/src/site/markdown/tutorial_admin.md
index 90ee77c..5877c4c 100644
--- a/website/0.7.0-incubating/src/site/markdown/tutorial_admin.md
+++ b/website/0.7.0-incubating/src/site/markdown/tutorial_admin.md
@@ -30,7 +30,7 @@ Helix provides a set of admin APIs for cluster management operations. They are s
 * REST Interface via helix-admin-webapp
 
 ### Java API
-See interface [_org.apache.helix.HelixAdmin_](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/HelixAdmin.html)
+See interface [_org.apache.helix.HelixAdmin_](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/HelixAdmin.html)
 
 ### Command Line Interface
 The command line tool comes with helix-core package:
@@ -38,8 +38,8 @@ The command line tool comes with helix-core package:
 Get the command line tool:
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 ./build
 cd helix-core/target/helix-core-pkg/bin
@@ -108,8 +108,8 @@ All other commands have this form:
 The REST interface comes wit helix-admin-webapp package:
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout tags/helix-0.7.0-incubating
 ./build
 cd helix-admin-webapp/target/helix-admin-webapp-pkg/bin

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/tutorial_messaging.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/tutorial_messaging.md b/website/0.7.0-incubating/src/site/markdown/tutorial_messaging.md
index bf22d05..4383408 100644
--- a/website/0.7.0-incubating/src/site/markdown/tutorial_messaging.md
+++ b/website/0.7.0-incubating/src/site/markdown/tutorial_messaging.md
@@ -67,4 +67,4 @@ int sentMessageCount = messagingService.sendAndWait(recipientCriteria,
     requestBackupUriRequest, responseHandler, timeout);
 ```
 
-See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more information.
+See HelixManager.DefaultMessagingService in the [Javadocs](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/messaging/DefaultMessagingService.html) for more information.

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/tutorial_propstore.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/tutorial_propstore.md b/website/0.7.0-incubating/src/site/markdown/tutorial_propstore.md
index 5e9d8b6..5070a00 100644
--- a/website/0.7.0-incubating/src/site/markdown/tutorial_propstore.md
+++ b/website/0.7.0-incubating/src/site/markdown/tutorial_propstore.md
@@ -31,4 +31,4 @@ It is common that an application needs support for distributed, shared data stru
 
 While you could use ZooKeeper directly, Helix supports caching the data with a write-through cache. This is far more efficient than reading from ZooKeeper for every access.
 
-See [HelixManager.getHelixPropertyStore](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/store/package-summary.html) for details.
+See [HelixManager.getHelixPropertyStore](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/store/package-summary.html) for details.

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/tutorial_user_def_rebalancer.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/tutorial_user_def_rebalancer.md b/website/0.7.0-incubating/src/site/markdown/tutorial_user_def_rebalancer.md
index 90577af..3c0c6b2 100644
--- a/website/0.7.0-incubating/src/site/markdown/tutorial_user_def_rebalancer.md
+++ b/website/0.7.0-incubating/src/site/markdown/tutorial_user_def_rebalancer.md
@@ -27,7 +27,7 @@ Even though Helix can compute both the location and the state of replicas intern
 
 Whenever the state of the cluster changes, as is the case when participants join or leave the cluster, Helix automatically calls the rebalancer to compute a new mapping of all the replicas in the resource. When using a pluggable rebalancer, the only required step is to register it with Helix. Subsequently, no additional bootstrapping steps are necessary. Helix uses reflection to look up and load the class dynamically at runtime. As a result, it is also technically possible to change the rebalancing strategy used at any time.
 
-The [HelixRebalancer](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html) interface is as follows:
+The [HelixRebalancer](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/HelixRebalancer.html) interface is as follows:
 
 ```
 public void init(HelixManager helixManager);
@@ -41,7 +41,7 @@ A ResourceAssignment is a full representation of the location and the state of e
 
 ### Rebalancer Context
 
-Helix provides an interface called [RebalancerContext](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/RebalancerContext.html). For each of the four main [rebalancing modes](./tutorial_rebalance.html), there is a base class called [PartitionedRebalancerContext](http://helix.incubator.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/PartitionedRebalancerContext.html), which contains all of the basic properties required for a partitioned resource. Helix provides three derived classes for PartitionedRebalancerContext: FullAutoRebalancerContext, SemiAutoRebalancerContext, and CustomizedRebalancerContext. If none of these work for your application, you can create your own class that derives PartiitonedRebalancerContext (or even only implements RebalancerContext).
+Helix provides an interface called [RebalancerContext](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/RebalancerContext.html). For each of the four main [rebalancing modes](./tutorial_rebalance.html), there is a base class called [PartitionedRebalancerContext](http://helix.apache.org/javadocs/0.7.0-incubating/reference/org/apache/helix/controller/rebalancer/context/PartitionedRebalancerContext.html), which contains all of the basic properties required for a partitioned resource. Helix provides three derived classes for PartitionedRebalancerContext: FullAutoRebalancerContext, SemiAutoRebalancerContext, and CustomizedRebalancerContext. If none of these work for your application, you can create your own class that derives PartiitonedRebalancerContext (or even only implements RebalancerContext).
 
 ### Specifying a Rebalancer
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/markdown/tutorial_yaml.md
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/markdown/tutorial_yaml.md b/website/0.7.0-incubating/src/site/markdown/tutorial_yaml.md
index 4660afa..1e4772e 100644
--- a/website/0.7.0-incubating/src/site/markdown/tutorial_yaml.md
+++ b/website/0.7.0-incubating/src/site/markdown/tutorial_yaml.md
@@ -82,7 +82,7 @@ participants: # list of nodes that can serve replicas (optional if dynamic joini
 Using a file like the one above, the cluster can be set up either with the command line:
 
 ```
-incubator-helix/helix-core/target/helix-core/pkg/bin/YAMLClusterSetup.sh localhost:2199 lock-manager-config.yaml
+helix/helix-core/target/helix-core/pkg/bin/YAMLClusterSetup.sh localhost:2199 lock-manager-config.yaml
 ```
 
 or with code:

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/site.xml
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/site.xml b/website/0.7.0-incubating/src/site/site.xml
index 8ba455d..463dcab 100644
--- a/website/0.7.0-incubating/src/site/site.xml
+++ b/website/0.7.0-incubating/src/site/site.xml
@@ -18,7 +18,7 @@
 <project name="Apache Helix">
   <bannerLeft>
     <src>../images/helix-logo.jpg</src>
-    <href>http://helix.incubator.apache.org/</href>
+    <href>http://helix.apache.org/</href>
   </bannerLeft>
   <bannerRight>
     <src>../images/feather_small.gif</src>
@@ -54,8 +54,8 @@
     </head>
 
     <breadcrumbs position="left">
-      <item name="Apache Helix" href="http://helix.incubator.apache.org/"/>
-      <item name="Release 0.7.0-incubating" href="http://helix.incubator.apache.org/0.7.0-incubating-docs/"/>
+      <item name="Apache Helix" href="http://helix.apache.org/"/>
+      <item name="Release 0.7.0-incubating" href="http://helix.apache.org/0.7.0-incubating-docs/"/>
     </breadcrumbs>
 
     <links>
@@ -71,7 +71,7 @@
     <menu name="Hands-On">
       <item name="Quick Start" href="./Quickstart.html"/>
       <item name="Tutorial" href="./Tutorial.html"/>
-      <item name="Javadocs" href="http://helix.incubator.apache.org/javadocs/0.7.0-incubating"/>
+      <item name="Javadocs" href="http://helix.apache.org/javadocs/0.7.0-incubating"/>
     </menu>
 
     <menu name="Recipes">
@@ -110,7 +110,7 @@
       <highlightJs>false</highlightJs>
       <brand>
         <name>Apache Helix</name>
-        <href>http://helix.incubator.apache.org</href>
+        <href>http://helix.apache.org</href>
       </brand>
       <slogan>A cluster management framework for partitioned and replicated distributed resources</slogan>
       <bottomNav>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/0.7.0-incubating/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/website/0.7.0-incubating/src/site/xdoc/download.xml.vm b/website/0.7.0-incubating/src/site/xdoc/download.xml.vm
index 6949719..20ca8aa 100644
--- a/website/0.7.0-incubating/src/site/xdoc/download.xml.vm
+++ b/website/0.7.0-incubating/src/site/xdoc/download.xml.vm
@@ -25,7 +25,7 @@ under the License.
 
   <properties>
     <title>Apache Helix Downloads</title>
-    <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
+    <author email="dev@helix.apache.org">Apache Helix Documentation Team</author>
   </properties>
 
   <body>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/src/site/apt/releasing.apt
----------------------------------------------------------------------
diff --git a/website/src/site/apt/releasing.apt b/website/src/site/apt/releasing.apt
index 72cea5a..3c49eaf 100644
--- a/website/src/site/apt/releasing.apt
+++ b/website/src/site/apt/releasing.apt
@@ -27,7 +27,7 @@
 
 Helix Release Process
 
- [[1]] Post to dev@helix.incubator.apache.org a few days before you plan to do a Helix release
+ [[1]] Post to dev@helix.apache.org a few days before you plan to do a Helix release
 
  [[2]] Your Maven settings must contain this entry to be able to deploy.
 
@@ -101,11 +101,11 @@ svn ci
 
 +-------------
 Subject: [VOTE] Apache Helix [VERSION]-incubating Release
-To: dev@helix.incubator.apache.org
+To: dev@helix.apache.org
 ---------------------------------------------------------
 Hi, I'd like to release Apache Helix [VERSION]-incubating.
 
-Release notes: http://helix.incubator.apache.org/releasenotes/release-[VERSION]-incubating.html
+Release notes: http://helix.apache.org/releasenotes/release-[VERSION]-incubating.html
 
 Maven staged release repository: https://repository.apache.org/content/repositories/orgapachehelix-[NNN]/
 
@@ -126,7 +126,7 @@ Vote open for 72H
 
 +-------------
 Subject: [RESULT][VOTE] Apache Helix [VERSION]-incubating Release
-To: dev@helix.incubator.apache.org
+To: dev@helix.apache.org
 -----------------------------------------------------------------
 Thanks for voting on the 0.6.2-incubating release. It has now exceeded 72 hours so I am closing the vote.
 
@@ -168,7 +168,7 @@ to build partitioned and replicated, fault tolerant and scalable
 distributed systems.
 
 Release notes:
-http://helix.incubator.apache.org/[VERSION]-incubating-docs/releasenotes/release-[VERSION]-incubating.html
+http://helix.apache.org/[VERSION]-incubating-docs/releasenotes/release-[VERSION]-incubating.html
 
 Our vote thread on helix-dev:
 http://markmail.org/message/[MESSAGE ID]
@@ -186,7 +186,7 @@ https://dist.apache.org/repos/dist/dev/incubator/helix/[VERSION]-incubating/bina
 https://dist.apache.org/repos/dist/dev/incubator/helix/[VERSION]-incubating/src/
 
 The 0.6.2-incubating release tag
-https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=tag;h=[TAG HASH]
+https://git-wip-us.apache.org/repos/asf?p=helix.git;a=tag;h=[TAG HASH]
 
 KEYS file available here:
 https://dist.apache.org/repos/dist/dev/incubator/helix/KEYS
@@ -246,7 +246,7 @@ svn mv https://dist.apache.org/repos/dist/dev/incubator/helix/KEYS https://dist.
 
 +-------------
 Subject: [ANNOUNCE] Apache Helix [VERSION]-incubating Release
-To: dev@helix.incubator.apache.org; user@helix.incubator.apache.org
+To: dev@helix.apache.org; user@helix.apache.org
 -------------------------------------------------------------------
 The Apache Helix Team is pleased to announce the [NTH] release,
 [VERSION]-incubating, of the Apache Helix project.
@@ -255,7 +255,7 @@ Apache Helix is a generic cluster management framework that makes it easy
 to build partitioned, fault tolerant, and scalable distributed systems.
 
 The full release notes are available here:
-http://helix.incubator.apache.org/releasenotes/release-[VERSION]-incubating.html
+http://helix.apache.org/releasenotes/release-[VERSION]-incubating.html
 
 You can declare a maven dependency to use it:
 
@@ -266,12 +266,12 @@ You can declare a maven dependency to use it:
 </dependency>
 
 Or download the release sources:
-http://helix.incubator.apache.org/[VERSION]-incubating-docs/download.cgi
+http://helix.apache.org/[VERSION]-incubating-docs/download.cgi
 
 Additional info
 
-Website: http://helix.incubator.apache.org/
-Helix mailing lists: http://helix.incubator.apache.org/mail-lists.html
+Website: http://helix.apache.org/
+Helix mailing lists: http://helix.apache.org/mail-lists.html
 
 We hope you will enjoy using the latest release of Apache Helix!
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/website/src/site/markdown/index.md b/website/src/site/markdown/index.md
index 536ae6d..dbaadee 100644
--- a/website/src/site/markdown/index.md
+++ b/website/src/site/markdown/index.md
@@ -65,6 +65,14 @@ Modeling a distributed system as a state machine with constraints on states and
 
 ---
 
+### Join the Conversation
+
+[Bay Area Meetup Group](http://www.meetup.com/Building-distributed-systems-using-Apache-Helix-Meetup-group/)
+
+[`#apachehelix`](./IRC.html)
+
+[`user@helix.apache.org`](mailto:user@helix.apache.org)
+
 ### News
 
 Apache Helix has two new releases:
@@ -98,14 +106,8 @@ Apache Helix has two new releases:
 Requirements: JDK 1.6+, Maven 2.0.8+
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 git checkout helix-0.6.2-incubating
 mvn install package -DskipTests
 ```
-
-### Get Help
-
-[#apachehelix](./IRC.html)
-
-`user@helix.incubator.apache.org`

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/src/site/markdown/involved/contribdocs.md
----------------------------------------------------------------------
diff --git a/website/src/site/markdown/involved/contribdocs.md b/website/src/site/markdown/involved/contribdocs.md
index 80640f8..30c1800 100644
--- a/website/src/site/markdown/involved/contribdocs.md
+++ b/website/src/site/markdown/involved/contribdocs.md
@@ -24,8 +24,8 @@ Learn something new about Helix that you think would benefit others? The source
 
 ### Get the Code
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix/website
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix/website
 ```
 
 ### Make Changes

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/src/site/markdown/sources.md
----------------------------------------------------------------------
diff --git a/website/src/site/markdown/sources.md b/website/src/site/markdown/sources.md
index a8193b2..0d5dd90 100644
--- a/website/src/site/markdown/sources.md
+++ b/website/src/site/markdown/sources.md
@@ -31,14 +31,14 @@ This project uses [Git](http://git-scm.com/) to manage its source code. Instruct
 
 The following is a link to the online source repository.
 
-[https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=summary](https://git-wip-us.apache.org/repos/asf?p=incubator-helix.git;a=summary)
+[https://git-wip-us.apache.org/repos/asf?p=helix.git;a=summary](https://git-wip-us.apache.org/repos/asf?p=helix.git;a=summary)
 
 ### Anonymous Access
 
 The source can be checked out anonymously from Git with this command (See [http://git-scm.com/docs/git-clone](http://git-scm.com/docs/git-clone)):
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
 ```
 
 ### Developer Access
@@ -46,7 +46,7 @@ git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
 Only project developers can access the Git tree via this method (See [http://git-scm.com/docs/git-clone](http://git-scm.com/docs/git-clone)).
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
 ```
 
 ### Access from Behind a Firewall

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/src/site/site.xml
----------------------------------------------------------------------
diff --git a/website/src/site/site.xml b/website/src/site/site.xml
index dcd48de..bdbdba7 100644
--- a/website/src/site/site.xml
+++ b/website/src/site/site.xml
@@ -18,7 +18,7 @@
 <project name="Apache Helix">
   <bannerLeft>
     <src>images/helix-logo.jpg</src>
-    <href>http://helix.incubator.apache.org/</href>
+    <href>http://helix.apache.org/</href>
   </bannerLeft>
   <bannerRight>
     <src>images/feather_small.gif</src>
@@ -54,7 +54,7 @@
     </head>
 
     <breadcrumbs position="left">
-      <item name="Apache Helix" href="http://helix.incubator.apache.org/"/>
+      <item name="Apache Helix" href="http://helix.apache.org/"/>
     </breadcrumbs>
 
     <menu name="Learn">
@@ -126,7 +126,7 @@
       <highlightJs>false</highlightJs>
       <brand>
         <name>Apache Helix</name>
-        <href>http://helix.incubator.apache.org</href>
+        <href>http://helix.apache.org</href>
       </brand>
       <slogan>A cluster management framework for partitioned and replicated distributed resources</slogan>
       <bottomNav>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/src/site/xdoc/download.xml.vm
----------------------------------------------------------------------
diff --git a/website/src/site/xdoc/download.xml.vm b/website/src/site/xdoc/download.xml.vm
index ce4769a..7961104 100644
--- a/website/src/site/xdoc/download.xml.vm
+++ b/website/src/site/xdoc/download.xml.vm
@@ -23,7 +23,7 @@ under the License.
 
   <properties>
     <title>Apache Helix Downloads</title>
-    <author email="dev@helix.incubator.apache.org">Apache Helix Documentation Team</author>
+    <author email="dev@helix.apache.org">Apache Helix Documentation Team</author>
   </properties>
 
   <body>

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/Building.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/Building.md b/website/trunk/src/site/markdown/Building.md
index 6ea8777..6f4fae8 100644
--- a/website/trunk/src/site/markdown/Building.md
+++ b/website/trunk/src/site/markdown/Building.md
@@ -25,7 +25,7 @@ Build Instructions
 Requirements: JDK 1.6+, Maven 2.0.8+
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 mvn install package -DskipTests
 ```

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/Quickstart.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/Quickstart.md b/website/trunk/src/site/markdown/Quickstart.md
index ec4752b..1a74b9b 100644
--- a/website/trunk/src/site/markdown/Quickstart.md
+++ b/website/trunk/src/site/markdown/Quickstart.md
@@ -32,8 +32,8 @@ First, let\'s get Helix. Either build it, or download it.
 ### Build
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 mvn install package -DskipTests
 # This folder contains quickstart.sh and start-helix-participant.sh
 cd helix-examples/target/helix-examples-pkg/bin
@@ -58,7 +58,7 @@ Helix provides command line interfaces to set up the cluster and view the cluste
 If you built the code:
 
 ```
-cd helix/incubator-helix/helix-examples/target/helix-examples-pkg/bin
+cd helix/helix/helix-examples/target/helix-examples-pkg/bin
 ```
 
 If you downloaded the release package, extract it.
@@ -80,7 +80,7 @@ You can observe the components working together in this demo, which does the fol
 ### Run the Demo
 
 ```
-cd helix/incubator-helix/helix-examples/target/helix-examples-pkg/bin
+cd helix/helix/helix-examples/target/helix-examples-pkg/bin
 ./quickstart.sh
 ```
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/index.md b/website/trunk/src/site/markdown/index.md
index 923ddbc..4c3a801 100644
--- a/website/trunk/src/site/markdown/index.md
+++ b/website/trunk/src/site/markdown/index.md
@@ -31,7 +31,7 @@ under the License.
 
 [Tutorial](./Tutorial.html)
 
-[Javadocs](http://helix.incubator.apache.org/apidocs)
+[Javadocs](http://helix.apache.org/apidocs)
 
 ### Recipes
 

http://git-wip-us.apache.org/repos/asf/helix/blob/ed3de1e5/website/trunk/src/site/markdown/recipes/lock_manager.md
----------------------------------------------------------------------
diff --git a/website/trunk/src/site/markdown/recipes/lock_manager.md b/website/trunk/src/site/markdown/recipes/lock_manager.md
index 124e7bd..e288532 100644
--- a/website/trunk/src/site/markdown/recipes/lock_manager.md
+++ b/website/trunk/src/site/markdown/recipes/lock_manager.md
@@ -48,8 +48,8 @@ To quickly see this working run the `lock-manager-demo` script where 12 locks ar
 This version starts multiple threads within the same process to simulate a multi node deployment. Try the long version to get a better idea of how it works.
 
 ```
-git clone https://git-wip-us.apache.org/repos/asf/incubator-helix.git
-cd incubator-helix
+git clone https://git-wip-us.apache.org/repos/asf/helix.git
+cd helix
 mvn clean install package -DskipTests
 cd recipes/distributed-lock-manager/target/distributed-lock-manager-pkg/bin
 chmod +x *


Mime
View raw message