accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Thu, 19 Dec 2013 01:02:54 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	conf/examples/1GB/native-standalone/accumulo-site.xml
	conf/examples/1GB/standalone/accumulo-site.xml
	conf/examples/2GB/native-standalone/accumulo-site.xml
	conf/examples/2GB/standalone/accumulo-site.xml
	conf/examples/3GB/native-standalone/accumulo-site.xml
	conf/examples/3GB/standalone/accumulo-site.xml
	conf/examples/512MB/native-standalone/accumulo-site.xml
	conf/examples/512MB/standalone/accumulo-site.xml

Also updated the vfs-classloader and crypto example configs


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 5d952c7485f1aecdb41b6f2a926d36cba6e1c972
Parents: 8148134 4bed940
Author: Josh Elser <elserj@apache.org>
Authored: Wed Dec 18 20:02:22 2013 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Wed Dec 18 20:02:22 2013 -0500

----------------------------------------------------------------------
 .../1GB/native-standalone/accumulo-site.xml     |   5 +
 conf/examples/1GB/standalone/accumulo-site.xml  |   5 +
 .../2GB/native-standalone/accumulo-site.xml     |   5 +
 conf/examples/2GB/standalone/accumulo-site.xml  | 123 ++++++++++---------
 .../3GB/native-standalone/accumulo-site.xml     |   5 +
 conf/examples/3GB/standalone/accumulo-site.xml  |   5 +
 .../512MB/native-standalone/accumulo-site.xml   |   5 +
 .../examples/512MB/standalone/accumulo-site.xml |   5 +
 conf/examples/crypto/accumulo-site.xml          |   5 +
 conf/examples/vfs-classloader/accumulo-site.xml |   5 +
 10 files changed, 109 insertions(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/1GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/native-standalone/accumulo-site.xml
index aaef665,9cb169f..44042e6
--- a/conf/examples/1GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/1GB/native-standalone/accumulo-site.xml
@@@ -88,24 -88,32 +88,29 @@@
    </property>
  
    <property>
 +    <name>general.maven.project.basedir</name>
 +    <value></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.
 -
 -       $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/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/1GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/1GB/standalone/accumulo-site.xml
index 843a24d,399a497..e32d143
--- a/conf/examples/1GB/standalone/accumulo-site.xml
+++ b/conf/examples/1GB/standalone/accumulo-site.xml
@@@ -88,24 -88,32 +88,29 @@@
    </property>
  
    <property>
 +    <name>general.maven.project.basedir</name>
 +    <value></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.
 -
 -       $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/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/2GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/native-standalone/accumulo-site.xml
index 49a44e3,d754ea9..9f308a2
--- a/conf/examples/2GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/2GB/native-standalone/accumulo-site.xml
@@@ -78,24 -78,32 +78,29 @@@
    </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.
 +    <name>general.maven.project.basedir</name>
 +    <value></value>
 +  </property>
  
 -       $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,
 -    -->
 +  <property>
 +    <name>general.classpaths</name>
      <value>
 -      $ACCUMULO_HOME/server/target/classes/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/2GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/2GB/standalone/accumulo-site.xml
index 4e244b7,795592d..b6546e5
--- a/conf/examples/2GB/standalone/accumulo-site.xml
+++ b/conf/examples/2GB/standalone/accumulo-site.xml
@@@ -26,89 -26,97 +26,94 @@@
  
    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.
+   <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>
+   <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>
+   <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.
 +    <name>general.maven.project.basedir</name>
 +    <value></value>
 +  </property>
  
 +  <property>
 +    <name>general.classpaths</name>
 +    <value>
 +      <!-- Comment the following for hadoop-1.2 -->
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/3GB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/native-standalone/accumulo-site.xml
index ac6d2ae,d603095..2ad5885
--- a/conf/examples/3GB/native-standalone/accumulo-site.xml
+++ b/conf/examples/3GB/native-standalone/accumulo-site.xml
@@@ -73,24 -73,32 +73,29 @@@
    </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.
 +    <name>general.maven.project.basedir</name>
 +    <value></value>
 +  </property>
  
 -       $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,
 -    -->
 +  <property>
 +    <name>general.classpaths</name>
      <value>
 -      $ACCUMULO_HOME/server/target/classes/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/3GB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/3GB/standalone/accumulo-site.xml
index 5f81dac,8616cf0..55edfec
--- a/conf/examples/3GB/standalone/accumulo-site.xml
+++ b/conf/examples/3GB/standalone/accumulo-site.xml
@@@ -78,24 -78,32 +78,29 @@@
    </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.
 +    <name>general.maven.project.basedir</name>
 +    <value></value>
 +  </property>
  
 -       $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,
 -    -->
 +  <property>
 +    <name>general.classpaths</name>
      <value>
 -      $ACCUMULO_HOME/server/target/classes/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/512MB/native-standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/native-standalone/accumulo-site.xml
index 09e3e30,29317f3..cd25aa8
--- a/conf/examples/512MB/native-standalone/accumulo-site.xml
+++ b/conf/examples/512MB/native-standalone/accumulo-site.xml
@@@ -83,24 -83,32 +83,29 @@@
    </property>
  
    <property>
 +    <name>general.maven.project.basedir</name>
 +    <value></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.
 -
 -       $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/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/512MB/standalone/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/512MB/standalone/accumulo-site.xml
index e6ed6de,b296497..b1d5470
--- a/conf/examples/512MB/standalone/accumulo-site.xml
+++ b/conf/examples/512MB/standalone/accumulo-site.xml
@@@ -89,24 -89,32 +89,29 @@@
    </property>
  
    <property>
 +    <name>general.maven.project.basedir</name>
 +    <value></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.
 -
 -       $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/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/crypto/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/crypto/accumulo-site.xml
index 1975fed,0000000..39a385b
mode 100644,000000..100644
--- a/conf/examples/crypto/accumulo-site.xml
+++ b/conf/examples/crypto/accumulo-site.xml
@@@ -1,167 -1,0 +1,172 @@@
 +<?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 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>password</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>
 +      <value>
 +        <!-- Comment the following for hadoop-1.2 -->
 +        $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,
 +
 +        $ACCUMULO_HOME/server/target/classes/,
 +        $ACCUMULO_HOME/core/target/classes/,
 +        $ACCUMULO_HOME/start/target/classes/,
 +        $ACCUMULO_HOME/fate/target/classes/,
 +        $ACCUMULO_HOME/proxy/target/classes/,
 +        $ACCUMULO_HOME/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.
 +      When using the Security Manager, please remove the ".../target/classes/" values.
 +      </description>
 +    </property>
 +
 +    <property>
 +      <name>crypto.module.class</name>
 +      <value>org.apache.accumulo.core.security.crypto.DefaultCryptoModule</value>
 +    </property>
 +    <property>
 +      <name>crypto.cipher.suite</name>
 +      <value>AES/CFB/PKCS5Padding</value>
 +    </property>
 +    <property>
 +      <name>crypto.cipher.algorithm.name</name>
 +      <value>AES</value>
 +    </property>
 +    <property>
 +      <name>crypto.cipher.key.length</name>
 +      <value>128</value>
 +    </property>
 +    <property>
 +      <name>crypto.secure.rng</name>
 +      <value>SHA1PRNG</value>
 +    </property>
 +    <property>
 +      <name>crypto.secure.rng.provider</name>
 +      <value>SUN</value>
 +    </property>
 +
 +    <property>
 +      <name>crypto.secret.key.encryption.strategy.class</name>
 +      <value>org.apache.accumulo.core.security.crypto.DefaultSecretKeyEncryptionStrategy</value>
 +    </property>
 +
 +    <property>
 +        <name>crypto.default.key.strategy.cipher.suite</name>
 +        <value>AES/ECB/NoPadding</value>
 +    </property>
 +<!--
 +     These properties can be useful for situations where you are conducting unit tests without
HDFS
 +    running.
 +-->
 +
 +<!--
 +    <property>
 +      <name>crypto.default.key.strategy.hdfs.uri</name>
 +      <value>file:///</value>
 +    </property>
 +    <property>
 +      <name>crypto.default.key.strategy.key.location</name>
 +      <value>/tmp/test.secret.key</value>
 +    </property>
 +-->
 +</configuration>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d952c74/conf/examples/vfs-classloader/accumulo-site.xml
----------------------------------------------------------------------
diff --cc conf/examples/vfs-classloader/accumulo-site.xml
index a7a43fa,9302486..4892ee1
--- a/conf/examples/vfs-classloader/accumulo-site.xml
+++ b/conf/examples/vfs-classloader/accumulo-site.xml
@@@ -83,24 -83,25 +83,29 @@@
    </property>
  
    <property>
 +    <name>general.maven.project.basedir</name>
 +    <value></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,
 -    -->
      <value>
 -      $ACCUMULO_HOME/server/target/classes/,
 +      <!-- Comment the following for hadoop-1.2 -->
 +      $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,
 +
        $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,


Mime
View raw message