You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/14 21:13:20 UTC
svn commit: r1456640 - in /accumulo/branches/1.5: ./ assemble/ bin/
conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/
conf/examples/2GB/native-standalone/ conf/examples/2GB/standalone/
conf/examples/3GB/native-standalone/ conf/examples...
Author: ecn
Date: Thu Mar 14 20:13:19 2013
New Revision: 1456640
URL: http://svn.apache.org/r1456640
Log:
ACCUMULO-804 pick up the new location of the hadoop jars
Modified:
accumulo/branches/1.5/ (props changed)
accumulo/branches/1.5/assemble/ (props changed)
accumulo/branches/1.5/bin/accumulo
accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml
accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml
accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml
accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml
accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-site.xml
accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-site.xml
accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-env.sh
accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-site.xml
accumulo/branches/1.5/core/ (props changed)
accumulo/branches/1.5/examples/ (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/branches/1.5/server/ (props changed)
accumulo/branches/1.5/src/ (props changed)
accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
Propchange: accumulo/branches/1.5/
------------------------------------------------------------------------------
Merged /accumulo/trunk:r1456618,1456635
Propchange: accumulo/branches/1.5/assemble/
------------------------------------------------------------------------------
Merged /accumulo/trunk/assemble:r1456618,1456635
Modified: accumulo/branches/1.5/bin/accumulo
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/bin/accumulo?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/bin/accumulo (original)
+++ accumulo/branches/1.5/bin/accumulo Thu Mar 14 20:13:19 2013
@@ -110,11 +110,17 @@ export JAVA_HOME HADOOP_PREFIX ZOOKEEPER
JAVA="$JAVA_HOME/bin/java"
PLATFORM=$( $JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform )
+# hadoop 1.0, 1.1
+LIB_PATH="$HADOOP_PREFIX/lib/native/$PLATFORM"
+if [ ! -d "$LIB_PATH" ]; then
+ # hadoop-2.0
+ LIB_PATH=$HADOOP_PREFIX/lib/native
+fi
#
# app isn't used anywhere, but it makes the process easier to spot when ps/top/snmp truncate the command line
exec $JAVA "-Dapp=$1" $ACCUMULO_OPTS -classpath $CLASSPATH -XX:OnOutOfMemoryError="kill -9 %p" \
-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl \
- -Djava.library.path="$HADOOP_PREFIX/lib/native/$PLATFORM" \
+ -Djava.library.path="$LIB_PATH" \
-Dorg.apache.accumulo.core.home.dir="$ACCUMULO_HOME" \
-Dhadoop.home.dir="$HADOOP_PREFIX" \
-Dzookeeper.home.dir="$ZOOKEEPER_HOME" \
Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
Modified: accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/1GB/native-standalone/accumulo-site.xml Thu Mar 14 20:13:19 2013
@@ -86,6 +86,13 @@
<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,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
Modified: accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/1GB/standalone/accumulo-site.xml Thu Mar 14 20:13:19 2013
@@ -81,6 +81,13 @@
<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,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
Modified: accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/2GB/native-standalone/accumulo-site.xml Thu Mar 14 20:13:19 2013
@@ -76,6 +76,13 @@
<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,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Modified: accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/2GB/standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
Modified: accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/3GB/native-standalone/accumulo-site.xml Thu Mar 14 20:13:19 2013
@@ -71,6 +71,13 @@
<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,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Modified: accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
Modified: accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-site.xml?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/3GB/standalone/accumulo-site.xml Thu Mar 14 20:13:19 2013
@@ -71,6 +71,13 @@
<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,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Modified: accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
Modified: accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/512MB/native-standalone/accumulo-site.xml Thu Mar 14 20:13:19 2013
@@ -81,6 +81,13 @@
<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,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Modified: accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-env.sh?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-env.sh (original)
+++ accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-env.sh Thu Mar 14 20:13:19 2013
@@ -35,6 +35,8 @@ else
unset HADOOP_HOME
fi
test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf"
+# hadoop-2.0:
+# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop"
test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
Modified: accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-site.xml?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/branches/1.5/conf/examples/512MB/standalone/accumulo-site.xml Thu Mar 14 20:13:19 2013
@@ -87,6 +87,13 @@
<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,
+ -->
<value>
$ACCUMULO_HOME/server/target/classes/,
$ACCUMULO_HOME/core/target/classes/,
Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
Merged /accumulo/trunk/core:r1456618,1456635
Propchange: accumulo/branches/1.5/examples/
------------------------------------------------------------------------------
Merged /accumulo/trunk/examples:r1456618,1456635
Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1456618,1456635
Propchange: accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1456618,1456635
Propchange: accumulo/branches/1.5/server/
------------------------------------------------------------------------------
Merged /accumulo/trunk/server:r1456618,1456635
Propchange: accumulo/branches/1.5/src/
------------------------------------------------------------------------------
Merged /accumulo/trunk/src:r1456618,1456635
Modified: accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java (original)
+++ accumulo/branches/1.5/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java Thu Mar 14 20:13:19 2013
@@ -45,8 +45,18 @@ public class AccumuloClassLoader {
public static final String CLASSPATH_PROPERTY_NAME = "general.classpaths";
- public static final String ACCUMULO_CLASSPATH_VALUE = "$ACCUMULO_HOME/conf,\n" + "$ACCUMULO_HOME/lib/[^.].*.jar,\n"
- + "$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n" + "$HADOOP_PREFIX/[^.].*.jar,\n" + "$HADOOP_CONF_DIR,\n" + "$HADOOP_PREFIX/lib/[^.].*.jar,\n";
+ public static final String ACCUMULO_CLASSPATH_VALUE =
+ "$ACCUMULO_HOME/conf,\n" +
+ "$ACCUMULO_HOME/lib/[^.].*.jar,\n" +
+ "$ZOOKEEPER_HOME/zookeeper[^.].*.jar,\n" +
+ "$HADOOP_CONF_DIR,\n" +
+ "$HADOOP_PREFIX/[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/lib/[^.].*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/common/.*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/common/lib/.*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/hdfs/.*.jar,\n" +
+ "$HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,\n"
+ ;
private static String SITE_CONF;
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java?rev=1456640&r1=1456639&r2=1456640&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java Thu Mar 14 20:13:19 2013
@@ -263,7 +263,15 @@ public class MiniAccumuloCluster {
appendProp(fileWriter, Property.TSERV_NATIVEMAP_ENABLED, "false", siteConfig);
// since there is a small amount of memory, check more frequently for majc... setting may not be needed in 1.5
appendProp(fileWriter, Property.TSERV_MAJC_DELAY, "3", siteConfig);
- String cp = System.getenv("ACCUMULO_HOME")+"/lib/.*.jar,$ZOOKEEPER_HOME/zookeeper[^.].*.jar,$HADOOP_HOME/[^.].*.jar,$HADOOP_HOME/lib/[^.].*.jar";
+ String cp = System.getenv("ACCUMULO_HOME")+"/lib/.*.jar,"+
+ "$ZOOKEEPER_HOME/zookeeper[^.].*.jar,"+
+ "$HADOOP_HOME/[^.].*.jar,"+
+ "$HADOOP_HOME/lib/[^.].*.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"
+ ;
appendProp(fileWriter, Property.GENERAL_CLASSPATHS, cp, siteConfig);
appendProp(fileWriter, Property.GENERAL_DYNAMIC_CLASSPATHS, libDir.getAbsolutePath(), siteConfig);