accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1456635 - in /accumulo/trunk: 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/3GB/standalone/ conf/exa...
Date Thu, 14 Mar 2013 20:09:40 GMT
Author: ecn
Date: Thu Mar 14 20:09:39 2013
New Revision: 1456635

URL: http://svn.apache.org/r1456635
Log:
ACCUMULO-804 pick up the new location of the hadoop jars

Modified:
    accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh
    accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
    accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
    accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java

Modified: accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-env.sh Thu Mar 14 20:09:39
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/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml Thu Mar 14 20:09:39
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/trunk/conf/examples/1GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-env.sh Thu Mar 14 20:09:39 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/trunk/conf/examples/1GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Thu Mar 14 20:09:39 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/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-env.sh Thu Mar 14 20:09:39
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/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml Thu Mar 14 20:09:39
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/trunk/conf/examples/2GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-env.sh Thu Mar 14 20:09:39 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/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-env.sh Thu Mar 14 20:09:39
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/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml Thu Mar 14 20:09:39
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/trunk/conf/examples/3GB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-env.sh Thu Mar 14 20:09:39 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/trunk/conf/examples/3GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml Thu Mar 14 20:09:39 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/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-env.sh Thu Mar 14 20:09:39
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/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml Thu Mar 14 20:09:39
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/trunk/conf/examples/512MB/standalone/accumulo-env.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh (original)
+++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-env.sh Thu Mar 14 20:09:39 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/trunk/conf/examples/512MB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml Thu Mar 14 20:09:39 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/,

Modified: accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
(original)
+++ accumulo/trunk/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
Thu Mar 14 20:09:39 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/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java?rev=1456635&r1=1456634&r2=1456635&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/MiniAccumuloCluster.java Thu
Mar 14 20:09:39 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);
     



Mime
View raw message