Return-Path: 
 <commits-return-7208-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id BD07D10393
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Thu, 19 Dec 2013 02:55:01 +0000 (UTC)
Received: (qmail 44727 invoked by uid 500); 19 Dec 2013 02:55:01 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 44635 invoked by uid 500); 19 Dec 2013 02:55:01 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 44571 invoked by uid 99); 19 Dec 2013 02:55:01 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 02:55:01 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 53DF5E29C; Thu, 19 Dec 2013 02:55:01 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: elserj@apache.org
To: commits@accumulo.apache.org
Date: Thu, 19 Dec 2013 02:55:05 -0000
Message-Id: <fa568aa62d94494290c01421405993cd@git.apache.org>
In-Reply-To: <d4602ed421504c488f0a6a53b9490ff6@git.apache.org>
References: <d4602ed421504c488f0a6a53b9490ff6@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [05/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
	conf/examples/2GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/standalone/accumulo-site.xml

Also fixed the formatting in 2GB-standalone as it didn't match everything else.


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

Branch: refs/heads/master
Commit: 4bed94046b77000361125c8967b93804b95a1014
Parents: 001fdd6 40df8cd
Author: Josh Elser <elserj@apache.org>
Authored: Wed Dec 18 19:03:12 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Dec 18 19:03:12 2013 -0500

----------------------------------------------------------------------
 .../1GB/native-standalone/accumulo-site.xml     |   9 +-
 conf/examples/1GB/standalone/accumulo-site.xml  |   9 +-
 .../2GB/native-standalone/accumulo-site.xml     |   9 +-
 conf/examples/2GB/standalone/accumulo-site.xml  | 137 ++++++++++---------
 .../3GB/native-standalone/accumulo-site.xml     |   9 +-
 conf/examples/3GB/standalone/accumulo-site.xml  |   9 +-
 .../512MB/native-standalone/accumulo-site.xml   |   9 +-
 .../examples/512MB/standalone/accumulo-site.xml |   9 +-
 8 files changed, 128 insertions(+), 72 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/native-standalone/accumulo-site.xml
index 7e54b23,3ff1537..9cb169f
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@@ -18,104 -18,112 +18,111 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
 -	<!--
 -  Put your site-specific accumulo configurations here.
 -
 -  The available configuration values along with their defaults
 -  are documented in docs/config.html
 -
 -  Unless you are simply testing at your workstation, you will most 
 -  definitely need to change the three entries below.
 -	-->
 -
 -    <property>
 -      <name>instance.zookeeper.host</name>
 -      <value>localhost:2181</value>
 -      <description>comma separated list of zookeeper servers</description>
 -    </property>
 -
 -    <property>
 -      <name>logger.dir.walog</name>
 -      <value>walogs</value>
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
 -
 -    <property>
 -      <name>tserver.memory.maps.max</name>
 -      <value>256M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.data.size</name>
 -      <value>15M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>40M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 -
 -    <property>
 -      <name>logger.sort.buffer.size</name>
 -      <value>50M</value>
 -    </property>
 -
 -    <property>
 -      <name>tserver.walog.max.size</name>
 -      <value>256M</value>
 -    </property>
 -
 -    <property>
 -      <name>tserver.walog.max.size</name>
 -      <value>100M</value>
 -    </property>
 -
 -    <property>
 -      <name>general.classpaths</name>
 +  <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
 +
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
 +
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>256M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>15M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>40M</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.sort.buffer.size</name>
 +    <value>50M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>256M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>100M</value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
+        Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+        This list may be excessive, but this should cause no issues.
+ 
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
         $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
         $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
         $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+        /usr/lib/hadoop/.*.jar,
+        /usr/lib/hadoop/lib/.*.jar,
+        /usr/lib/hadoop-hdfs/.*.jar,
+        /usr/lib/hadoop-mapreduce/.*.jar,
+        /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/standalone/accumulo-site.xml
index ec95e02,eddb25f..399a497
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@@ -18,104 -18,107 +18,111 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
 -	<!--
 -  Put your site-specific accumulo configurations here.
 -
 -  The available configuration values along with their defaults
 -  are documented in docs/config.html
 -
 -  Unless you are simply testing at your workstation, you will most 
 -  definitely need to change the three entries below.
 -	-->
 -
 -    <property>
 -      <name>instance.zookeeper.host</name>
 -      <value>localhost:2181</value>
 -      <description>comma separated list of zookeeper servers</description>
 -    </property>
 -
 -    <property>
 -      <name>logger.dir.walog</name>
 -      <value>walogs</value>
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
 -
 -    <property>
 -      <name>tserver.memory.maps.max</name>
 -      <value>256M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.data.size</name>
 -      <value>15M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>40M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>logger.sort.buffer.size</name>
 -      <value>50M</value>
 -    </property>
 -
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.walog.max.size</name>
 -      <value>256M</value>
 -    </property>
 -
 -    <property>
 -      <name>general.classpaths</name>
 +  <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
 +
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
 +
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>256M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.native.enabled</name>
 +    <value>false</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>15M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>40M</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.sort.buffer.size</name>
 +    <value>50M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>256M</value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
+        Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+        This list may be excessive, but this should cause no issues.
+ 
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
         $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
         $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
         $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+        /usr/lib/hadoop/.*.jar,
+        /usr/lib/hadoop/lib/.*.jar,
+        /usr/lib/hadoop-hdfs/.*.jar,
+        /usr/lib/hadoop-mapreduce/.*.jar,
+        /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/native-standalone/accumulo-site.xml
index f0f6f7f,811f9f8..d754ea9
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@@ -18,94 -18,102 +18,101 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
 -	<!--
 -  Put your site-specific accumulo configurations here.
 +  <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
  
 -  The available configuration values along with their defaults
 -  are documented in docs/config.html
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
  
 -  Unless you are simply testing at your workstation, you will most 
 -  definitely need to change the three entries below.
 -	-->
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>instance.zookeeper.host</name>
 -      <value>localhost:2181</value>
 -      <description>comma separated list of zookeeper servers</description>
 -    </property>
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>logger.dir.walog</name>
 -      <value>walogs</value>
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>512M</value>
 +  </property>
  
 -    <property>
 -      <name>tserver.memory.maps.max</name>
 -      <value>512M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.data.size</name>
 -      <value>30M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>80M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>30M</value>
 +  </property>
  
 -    <property>
 -      <name>tserver.walog.max.size</name>
 -      <value>512M</value>
 -    </property>
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>80M</value>
 +  </property>
  
 -    <property>
 -      <name>general.classpaths</name>
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>512M</value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
+        Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+        This list may be excessive, but this should cause no issues.
+ 
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
         $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
         $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
         $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+        /usr/lib/hadoop/.*.jar,
+        /usr/lib/hadoop/lib/.*.jar,
+        /usr/lib/hadoop-hdfs/.*.jar,
+        /usr/lib/hadoop-mapreduce/.*.jar,
+        /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/standalone/accumulo-site.xml
index e6e7b13,690142e..795592d
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@@ -18,7 -18,7 +18,7 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
--	<!--
++  <!--
    Put your site-specific accumulo configurations here.
  
    The available configuration values along with their defaults
@@@ -26,99 -26,94 +26,106 @@@
  
    Unless you are simply testing at your workstation, you will most 
    definitely need to change the three entries below.
--	-->
++  -->
  
--    <property>
--      <name>instance.zookeeper.host</name>
--      <value>localhost:2181</value>
--      <description>comma separated list of zookeeper servers</description>
--    </property>
++  <property>
++    <name>instance.zookeeper.host</name>
++    <value>localhost:2181</value>
++    <description>comma separated list of zookeeper servers</description>
++  </property>
  
--    <property>
--      <name>logger.dir.walog</name>
--      <value>walogs</value>
-       <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
-         filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
-         write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
++  <property>
++    <name>logger.dir.walog</name>
++    <value>walogs</value>
++    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
++      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
++      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
++  </description>
++  </property>
++  
++  <property>
++    <name>instance.secret</name>
++    <value>DEFAULT</value>
++    <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
++                 Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
++                 and then update this file.
 +    </description>
-     </property>
-     
-     <property>
-       <name>instance.secret</name>
-       <value>DEFAULT</value>
-       <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
-                    Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
-                    and then update this file.
-       </description>
-     </property>
++  </property>
  
--    <property>
--      <name>tserver.memory.maps.max</name>
--      <value>512M</value>
--    </property>
--    
--    <property>
-       <name>tserver.memory.maps.native.enabled</name>
-       <value>false</value>
-     </property>
 -      <name>tserver.cache.data.size</name>
 -      <value>30M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>80M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.walog.max.size</name>
 -      <value>512M</value>
 -    </property>
++  <property>
++    <name>tserver.memory.maps.max</name>
++    <value>512M</value>
++  </property>
++  
++  <property>
++    <name>tserver.memory.maps.native.enabled</name>
++    <value>false</value>
++  </property>
  
--    <property>
-       <name>tserver.cache.data.size</name>
-       <value>30M</value>
-     </property>
-     
-     <property>
-       <name>tserver.cache.index.size</name>
-       <value>80M</value>
-     </property>
-     
-     <property>
-       <name>trace.token.property.password</name>
-       <!-- 
-         change this to the root user's password, and/or change the user below 
-        -->
-       <value>secret</value>
-     </property>
-     
-     <property>
-       <name>trace.user</name>
-       <value>root</value>
-     </property>
-     
-     <property>
-       <name>tserver.walog.max.size</name>
-       <value>512M</value>
-     </property>
 -      <name>general.classpaths</name>
++  <property>
++    <name>tserver.cache.data.size</name>
++    <value>30M</value>
++  </property>
++  
++  <property>
++    <name>tserver.cache.index.size</name>
++    <value>80M</value>
++  </property>
++  
++  <property>
++    <name>trace.token.property.password</name>
++    <!-- 
++      change this to the root user's password, and/or change the user below 
++     -->
++    <value>secret</value>
++  </property>
++  
++  <property>
++    <name>trace.user</name>
++    <value>root</value>
++  </property>
++  
++  <property>
++    <name>tserver.walog.max.size</name>
++    <value>512M</value>
++  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
-        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
-        $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
-        $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
-        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
-        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
 -       Add the following for Hadoop2, actual needs depend on Hadoop installation details.
 -       This list may be excessive, but this should cause no issues.
++      Add the following for Hadoop2, actual needs depend on Hadoop installation details.
++      This list may be excessive, but this should cause no issues.
+ 
 -       $HADOOP_PREFIX/share/hadoop/common/.*.jar,
 -       $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
 -       $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
 -       $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
 -       $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
 -       /usr/lib/hadoop/.*.jar,
 -       /usr/lib/hadoop/lib/.*.jar,
 -       /usr/lib/hadoop-hdfs/.*.jar,
 -       /usr/lib/hadoop-mapreduce/.*.jar,
 -       /usr/lib/hadoop-yarn/.*.jar,
++      $HADOOP_PREFIX/share/hadoop/common/.*.jar,
++      $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
++      $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
++      $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
++      $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
++      /usr/lib/hadoop/.*.jar,
++      /usr/lib/hadoop/lib/.*.jar,
++      /usr/lib/hadoop-hdfs/.*.jar,
++      /usr/lib/hadoop-mapreduce/.*.jar,
++      /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/native-standalone/accumulo-site.xml
index 417a1bc,1e99a93..d603095
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@@ -18,89 -18,97 +18,96 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
 -	<!--
 -  Put your site-specific accumulo configurations here.
 +  <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
  
 -  The available configuration values along with their defaults
 -  are documented in docs/config.html
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
  
 -  Unless you are simply testing at your workstation, you will most 
 -  definitely need to change the three entries below.
 -	-->
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>instance.zookeeper.host</name>
 -      <value>localhost:2181</value>
 -      <description>comma separated list of zookeeper servers</description>
 -    </property>
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>logger.dir.walog</name>
 -      <value>walogs</value>
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>1G</value>
 +  </property>
  
 -    <property>
 -      <name>tserver.memory.maps.max</name>
 -      <value>1G</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.data.size</name>
 -      <value>50M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>512M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>128M</value>
 +  </property>
  
 -    <property>
 -      <name>general.classpaths</name>
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>128M</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
+        Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+        This list may be excessive, but this should cause no issues.
+ 
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
         $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
         $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
         $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+        /usr/lib/hadoop/.*.jar,
+        /usr/lib/hadoop/lib/.*.jar,
+        /usr/lib/hadoop-hdfs/.*.jar,
+        /usr/lib/hadoop-mapreduce/.*.jar,
+        /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/standalone/accumulo-site.xml
index 1080f1b,1e99a93..8616cf0
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@@ -18,94 -18,97 +18,101 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
 -	<!--
 -  Put your site-specific accumulo configurations here.
 +  <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
  
 -  The available configuration values along with their defaults
 -  are documented in docs/config.html
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
  
 -  Unless you are simply testing at your workstation, you will most 
 -  definitely need to change the three entries below.
 -	-->
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>instance.zookeeper.host</name>
 -      <value>localhost:2181</value>
 -      <description>comma separated list of zookeeper servers</description>
 -    </property>
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>logger.dir.walog</name>
 -      <value>walogs</value>
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>1G</value>
 +  </property>
  
 -    <property>
 -      <name>tserver.memory.maps.max</name>
 -      <value>1G</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.data.size</name>
 -      <value>50M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>512M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 +  <property>
 +    <name>tserver.memory.maps.native.enabled</name>
 +    <value>false</value>
 +  </property>
  
 -    <property>
 -      <name>general.classpaths</name>
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>128M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>128M</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
+        Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+        This list may be excessive, but this should cause no issues.
+ 
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
         $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
         $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
         $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+        /usr/lib/hadoop/.*.jar,
+        /usr/lib/hadoop/lib/.*.jar,
+        /usr/lib/hadoop-hdfs/.*.jar,
+        /usr/lib/hadoop-mapreduce/.*.jar,
+        /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/native-standalone/accumulo-site.xml
index f8d1efb,2b9584c..29317f3
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@@ -18,99 -18,107 +18,106 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
 -	<!--
 -  Put your site-specific accumulo configurations here.
 +  <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
  
 -  The available configuration values along with their defaults
 -  are documented in docs/config.html
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
  
 -  Unless you are simply testing at your workstation, you will most 
 -  definitely need to change the three entries below.
 -	-->
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>instance.zookeeper.host</name>
 -      <value>localhost:2181</value>
 -      <description>comma separated list of zookeeper servers</description>
 -    </property>
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers must know in order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
  
 -    <property>
 -      <name>logger.dir.walog</name>
 -      <value>walogs</value>
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>80M</value>
 +  </property>
  
 -    <property>
 -      <name>tserver.memory.maps.max</name>
 -      <value>80M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.data.size</name>
 -      <value>7M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>20M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>7M</value>
 +  </property>
  
 -    <property>
 -      <name>logger.sort.buffer.size</name>
 -      <value>50M</value>
 -    </property>
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>20M</value>
 +  </property>
  
 -    <property>
 -      <name>tserver.walog.max.size</name>
 -      <value>100M</value>
 -    </property>
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
  
 -    <property>
 -      <name>general.classpaths</name>
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.sort.buffer.size</name>
 +    <value>50M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>100M</value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
+        Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+        This list may be excessive, but this should cause no issues.
+ 
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
         $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
         $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
         $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+        /usr/lib/hadoop/.*.jar,
+        /usr/lib/hadoop/lib/.*.jar,
+        /usr/lib/hadoop-hdfs/.*.jar,
+        /usr/lib/hadoop-mapreduce/.*.jar,
+        /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4bed9404/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/standalone/accumulo-site.xml
index de07cd4,a312a87..b296497
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@@ -18,105 -18,107 +18,112 @@@
  <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
  
  <configuration>
 -	<!--
 -  Put your site-specific accumulo configurations here.
 -
 -  The available configuration values along with their defaults
 -  are documented in docs/config.html
 -
 -  Unless you are simply testing at your workstation, you will most 
 -  definitely need to change the three entries below.
 -	-->
 -
 -    <property>
 -      <name>instance.zookeeper.host</name>
 -      <value>localhost:2181</value>
 -      <description>comma separated list of zookeeper servers</description>
 -    </property>
 -
 -    <property>
 -      <name>logger.dir.walog</name>
 -      <value>walogs</value>
 -      <description>The directory used to store write-ahead logs on the local filesystem. It is possible to specify a comma-separated list of directories.</description>
 -    </property>
 -    
 -    <property>
 -      <name>instance.secret</name>
 -      <value>DEFAULT</value>
 -      <description>A secret unique to a given instance that all servers must know in order to communicate with one another. 
 -                   Change it before initialization. To change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret [oldpasswd] [newpasswd], 
 -                   and then update this file.
 -      </description>
 -    </property>
 -
 -    <property>
 -      <name>tserver.memory.maps.max</name>
 -      <value>80M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.data.size</name>
 -      <value>7M</value>
 -    </property>
 -    
 -    <property>
 -      <name>tserver.cache.index.size</name>
 -      <value>20M</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.password</name>
 -      <!-- 
 -        change this to the root user's password, and/or change the user below 
 -       -->
 -      <value>secret</value>
 -    </property>
 -    
 -    <property>
 -      <name>trace.user</name>
 -      <value>root</value>
 -    </property>
 -    
 -    <property>
 -      <name>logger.sort.buffer.size</name>
 -      <value>50M</value>
 -    </property>
 -
 -    <property>
 -      <name>tserver.walog.max.size</name>
 -      <value>100M</value>
 -    </property>
 -
 -    <property>
 -      <name>general.classpaths</name>
 +  <!-- Put your site-specific accumulo configurations here. The available configuration values along with their defaults are documented in docs/config.html Unless 
 +    you are simply testing at your workstation, you will most definitely need to change the three entries below. -->
 +
 +  <property>
 +    <name>instance.zookeeper.host</name>
 +    <value>localhost:2181</value>
 +    <description>comma separated list of zookeeper servers</description>
 +  </property>
 +
 +  <property>
 +    <name>logger.dir.walog</name>
 +    <value>walogs</value>
 +    <description>The property only needs to be set if upgrading from 1.4 which used to store write-ahead logs on the local 
 +      filesystem. In 1.5 write-ahead logs are stored in DFS.  When 1.5 is started for the first time it will copy any 1.4 
 +      write ahead logs into DFS.  It is possible to specify a comma-separated list of directories.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>instance.secret</name>
 +    <value>DEFAULT</value>
 +    <description>A secret unique to a given instance that all servers
 +      must know in order to communicate with one another.
 +      Change it before initialization. To
 +      change it later use ./bin/accumulo org.apache.accumulo.server.util.ChangeSecret --old [oldpasswd] --new [newpasswd],
 +      and then update this file.
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.max</name>
 +    <value>80M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.memory.maps.native.enabled</name>
 +    <value>false</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.data.size</name>
 +    <value>7M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.cache.index.size</name>
 +    <value>20M</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.token.property.password</name>
 +    <!-- change this to the root user's password, and/or change the user below -->
 +    <value>secret</value>
 +  </property>
 +
 +  <property>
 +    <name>trace.user</name>
 +    <value>root</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.sort.buffer.size</name>
 +    <value>50M</value>
 +  </property>
 +
 +  <property>
 +    <name>tserver.walog.max.size</name>
 +    <value>100M</value>
 +  </property>
 +
 +  <property>
 +    <name>general.classpaths</name>
      <!--
-        Add the following for hadoop-2.0
+        Add the following for Hadoop2, actual needs depend on Hadoop installation details.
+        This list may be excessive, but this should cause no issues.
+ 
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,
         $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,
         $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
         $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
+        /usr/lib/hadoop/.*.jar,
+        /usr/lib/hadoop/lib/.*.jar,
+        /usr/lib/hadoop-hdfs/.*.jar,
+        /usr/lib/hadoop-mapreduce/.*.jar,
+        /usr/lib/hadoop-yarn/.*.jar,
      -->
 -      <value>
 -    $ACCUMULO_HOME/src/server/target/classes/,
 -    $ACCUMULO_HOME/src/core/target/classes/,
 -    $ACCUMULO_HOME/src/start/target/classes/,
 -    $ACCUMULO_HOME/src/examples/target/classes/,
 -	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
 -	$ACCUMULO_HOME/lib/[^.].*.jar,
 -	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 -	$HADOOP_CONF_DIR,
 -	$HADOOP_PREFIX/[^.].*.jar,
 -	$HADOOP_PREFIX/lib/[^.].*.jar,
 -      </value>
 -      <description>Classpaths that accumulo checks for updates and class files.
 +    <value>
 +      $ACCUMULO_HOME/server/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-server.jar,
 +      $ACCUMULO_HOME/core/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-core.jar,
 +      $ACCUMULO_HOME/start/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-start.jar,
 +      $ACCUMULO_HOME/fate/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-fate.jar,
 +      $ACCUMULO_HOME/proxy/target/classes/,
 +      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
 +      $ACCUMULO_HOME/lib/[^.].*.jar,
 +      $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
 +      $HADOOP_CONF_DIR,
 +      $HADOOP_PREFIX/[^.].*.jar,
 +      $HADOOP_PREFIX/lib/[^.].*.jar,
 +    </value>
 +    <description>Classpaths that accumulo checks for updates and class files.
        When using the Security Manager, please remove the ".../target/classes/" values.
 -      </description>
 -    </property>
 -
 +    </description>
 +  </property>
  </configuration>