accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/4] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Date Fri, 03 Jan 2014 23:30:54 GMT
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

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

Also update the vfs-classloader general.classpaths example to match the rest of the examples


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

Branch: refs/heads/master
Commit: b93e8d8d6182f832e7b34eb32129ea7a71a81eef
Parents: 536211b a561152
Author: Josh Elser <josh.elser@gmail.com>
Authored: Fri Jan 3 18:11:23 2014 -0500
Committer: Josh Elser <josh.elser@gmail.com>
Committed: Fri Jan 3 18:11:23 2014 -0500

----------------------------------------------------------------------
 .../1GB/native-standalone/accumulo-site.xml     |  3 ++-
 conf/examples/1GB/standalone/accumulo-site.xml  |  3 ++-
 .../2GB/native-standalone/accumulo-site.xml     |  3 ++-
 conf/examples/2GB/standalone/accumulo-site.xml  |  5 +++--
 .../3GB/native-standalone/accumulo-site.xml     |  3 ++-
 conf/examples/3GB/standalone/accumulo-site.xml  |  3 ++-
 .../512MB/native-standalone/accumulo-site.xml   |  3 ++-
 .../examples/512MB/standalone/accumulo-site.xml |  3 ++-
 conf/examples/vfs-classloader/accumulo-site.xml | 20 ++++++++++++++------
 9 files changed, 31 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/native-standalone/accumulo-site.xml
index 9cb169f,f0202b0..8e467a6
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@@ -18,80 -18,86 +18,81 @@@
  <?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 Hadoop2, actual needs depend on Hadoop installation details.
-        This list may be excessive, but this should cause no issues.
+        This list may be excessive, but this should cause no issues. Append these values
+        after the $HADOOP_PREFIX entries
  
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/standalone/accumulo-site.xml
index 399a497,786d080..07fdc20
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@@ -18,80 -18,81 +18,81 @@@
  <?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 Hadoop2, actual needs depend on Hadoop installation details.
-        This list may be excessive, but this should cause no issues.
+        This list may be excessive, but this should cause no issues. Append these values
+        after the $HADOOP_PREFIX entries
  
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/native-standalone/accumulo-site.xml
index d754ea9,28318a4..8137bce
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@@ -18,70 -18,76 +18,71 @@@
  <?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 Hadoop2, actual needs depend on Hadoop installation details.
-        This list may be excessive, but this should cause no issues.
+        This list may be excessive, but this should cause no issues. Append these values
+        after the $HADOOP_PREFIX entries
  
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/standalone/accumulo-site.xml
index 795592d,14327e0..0f3865a
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@@ -26,106 -26,95 +26,107 @@@
  
    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 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>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.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>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 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. Append these values
+        after the $HADOOP_PREFIX entries
  
 -       $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/b93e8d8d/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/native-standalone/accumulo-site.xml
index d603095,aaec628..2a8baa4
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@@ -18,65 -18,71 +18,66 @@@
  <?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 Hadoop2, actual needs depend on Hadoop installation details.
-        This list may be excessive, but this should cause no issues.
+        This list may be excessive, but this should cause no issues. Append these values
+        after the $HADOOP_PREFIX entries
  
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/standalone/accumulo-site.xml
index 8616cf0,aaec628..0fecedf
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@@ -18,70 -18,71 +18,71 @@@
  <?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 Hadoop2, actual needs depend on Hadoop installation details.
-        This list may be excessive, but this should cause no issues.
+        This list may be excessive, but this should cause no issues. Append these values
+        after the $HADOOP_PREFIX entries
  
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/native-standalone/accumulo-site.xml
index 29317f3,4228344..69531b8
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@@ -18,75 -18,81 +18,76 @@@
  <?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 Hadoop2, actual needs depend on Hadoop installation details.
-        This list may be excessive, but this should cause no issues.
+        This list may be excessive, but this should cause no issues. Append these values
+        after the $HADOOP_PREFIX entries
  
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/standalone/accumulo-site.xml
index b296497,565d7dd..5ca8b33
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@@ -18,81 -18,81 +18,82 @@@
  <?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 Hadoop2, actual needs depend on Hadoop installation details.
-        This list may be excessive, but this should cause no issues.
+        This list may be excessive, but this should cause no issues. Append these values
+        after the $HADOOP_PREFIX entries
  
         $HADOOP_PREFIX/share/hadoop/common/.*.jar,
         $HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b93e8d8d/conf/examples/vfs-classloader/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/vfs-classloader/accumulo-site.xml
index 9302486,0000000..f14097b
mode 100644,000000..100644
--- a/conf/examples/vfs-classloader/accumulo-site.xml
+++ b/conf/examples/vfs-classloader/accumulo-site.xml
@@@ -1,174 -1,0 +1,182 @@@
 +<?xml version="1.0" encoding="UTF-8"?>
 +<!--
 +  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.
 +-->
 +<?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 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.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.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
-        $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. Append these values
++       after the $HADOOP_PREFIX entries
++
++      $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/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>
 +
 +  <!-- VFS ClassLoader Settings -->
 +  
 +  <!--
 +  At a minimum the general.vfs.classpath property must be set. After this is set in the configuration, the bin/bootstrap_hdfs.sh can be
 +  run to move the jars into the required locations. All other properties are optional. This example demonstrates using hdfs, other
 +  protocols supported by the Apache Commons VFS software can be used but are not demonstrated here. If the accumulo-site.xml changes
 +  after initial configuration, you will want to copy the file to all of the slave hosts. 
 +  -->
 +  <property>
 +    <name>general.vfs.classpaths</name>
 +    <value>hdfs://localhost:8020/accumulo/system-classpath</value>
 +    <description>Configuration for a system level vfs classloader. Accumulo jars can be configured here and loaded out of HDFS.</description>
 +  </property>
 +
 +  <property>
 +    <name>general.vfs.cache.dir</name>
 +    <value>/tmp</value>
 +    <description>Directory to use for the vfs cache. The cache will keep a soft reference to all of the classes loaded in the VM.
 +      This should be on local disk on
 +      each node with sufficient space. It defaults to /tmp and will use a directory with the
 +      format "accumulo-vfs-cache-" + System.getProperty("user.name",
 +      "nouser")
 +    </description>
 +  </property>
 +
 +  <!--
 +  Properties in this category define a classpath for a named context. These properties start with the category prefix, followed by a context name.
 +  The value is a comma seperated list of URIs. Supports full regex on filename alone. For example 
 +  general.vfs.context.classpath.cx1=hdfs://nn1:9902/mylibdir/*.jar.  You can enable post delegation for a context, which will load classes from 
 +  the context first instead of the parent first.  Do this by setting general.vfs.context.classpath.<name>.delegation=post, where <name> 
 +  is your context name.  If delegation is not specified, it defaults to loading from parent classloader first.
 +  -->
 +
 +  <property>
 +    <name>general.vfs.context.classpath.application1</name>
 +    <value>hdfs://localhost:8020/application1/classpath/*.jar</value>
 +    <description>classpath for the application1 context</description>
 +  </property>
 +
 +  <property>
 +    <name>general.vfs.context.classpath.application1.delegation=post</name>
 +    <value>hdfs://localhost:8020/application1/classpath/*.jar</value>
 +    <description>classpath for the application1 context, but the classloader parent delegation model is inverted to prefer the jars/classes in this directory
 +    </description>
 +  </property>
 +
 +  <property>
 +    <name>general.vfs.context.classpath.application2</name>
 +    <value>hdfs://localhost:8020/application1/classpath/*.jar,hdfs://localhost:8020/application2/classpath/*.jar</value>
 +    <description>classpath for the application2 context, includes all of the jars in app1 context</description>
 +  </property>
 +  
 +  <!--
 +  Once classpath context are configured, tables can be configured in the shell to use them via the table.classpath.context property.
 +  For example, all of the tables related to application1 would have the context.classpath property set to 'application1'. 
 +  -->
 +
 +</configuration>


Mime
View raw message