accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1480486 - in /accumulo/trunk: ./ 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/3GB/st...
Date Wed, 08 May 2013 22:06:38 GMT
Author: ctubbsii
Date: Wed May  8 22:06:37 2013
New Revision: 1480486

URL: http://svn.apache.org/r1480486
Log:
ACCUMULO-1384, ACCUMULO-1389 merged to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/README
    accumulo/trunk/assemble/   (props changed)
    accumulo/trunk/assemble/pom.xml
    accumulo/trunk/bin/accumulo
    accumulo/trunk/bin/bootstrap_hdfs.sh
    accumulo/trunk/bin/config.sh
    accumulo/trunk/bin/stop-all.sh
    accumulo/trunk/bin/stop-here.sh
    accumulo/trunk/bin/tdown.sh
    accumulo/trunk/bin/tool.sh
    accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml
    accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml
    accumulo/trunk/core/   (props changed)
    accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html
    accumulo/trunk/core/src/test/resources/disabled/conf/accumulo-site.xml
    accumulo/trunk/docs/combiners.html
    accumulo/trunk/docs/examples/README.bloom
    accumulo/trunk/docs/examples/README.combiner
    accumulo/trunk/docs/examples/README.constraints
    accumulo/trunk/docs/examples/README.mapred
    accumulo/trunk/docs/examples/README.maxmutation
    accumulo/trunk/docs/examples/README.regex
    accumulo/trunk/docs/examples/README.rowhash
    accumulo/trunk/docs/examples/README.tabletofile
    accumulo/trunk/examples/   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java   (props changed)
    accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java   (props changed)
    accumulo/trunk/pom.xml   (contents, props changed)
    accumulo/trunk/proxy/README   (props changed)
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/server/src/main/c++/nativeMap/Makefile
    accumulo/trunk/src/   (props changed)
    accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml
    accumulo/trunk/test/src/test/resources/conf/accumulo-site.xml
    accumulo/trunk/test/system/auto/TestUtils.py
    accumulo/trunk/test/system/auto/simple/mapreduce.py
    accumulo/trunk/test/system/bench/lib/Benchmark.py
    accumulo/trunk/test/system/continuous/agitator.pl
    accumulo/trunk/test/system/continuous/mapred-setup.sh

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5:r1480466-1480468,1480470-1480477

Modified: accumulo/trunk/README
URL: http://svn.apache.org/viewvc/accumulo/trunk/README?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/README (original)
+++ accumulo/trunk/README Wed May  8 22:06:37 2013
@@ -77,7 +77,7 @@ found in the same location on every mach
 have password-less ssh set up as described in the hadoop documentation. 
 
 You will need to have hadoop installed and configured on your system.  Accumulo
-1.6.0-SNAPSHOT has been tested with hadoop version 0.20.2.  To avoid data loss,
+1.6.0 has been tested with hadoop version 1.0.4.  To avoid data loss,
 you must enable HDFS durable sync.  How you enable this depends on your version
 of Hadoop. Please consult the table below for information regarding your version.
 If you need to set the coniguration, please be sure to restart HDFS. See 
@@ -186,7 +186,7 @@ scanned.
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: accumulo
     - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
     - 
@@ -207,7 +207,7 @@ certain column.
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: accumulo
     - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f
     - 

Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/assemble:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Modified: accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Wed May  8 22:06:37 2013
@@ -179,7 +179,7 @@
                     <provide>accumulo-trace</provide>
                   </provides>
                   <requires>
-                    <require>jdk</require>
+                    <require>jre</require>
                     <require>hadoop</require>
                     <require>zookeeper</require>
                   </requires>

Modified: accumulo/trunk/bin/accumulo
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/accumulo?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/bin/accumulo (original)
+++ accumulo/trunk/bin/accumulo Wed May  8 22:06:37 2013
@@ -28,7 +28,7 @@ script=$( basename "$SOURCE" )
 
 . "$bin"/config.sh
 
-START_JAR=$ACCUMULO_HOME/lib/accumulo-start-$ACCUMULO_VERSION.jar
+START_JAR=$ACCUMULO_HOME/lib/accumulo-start.jar
 
 #
 # Resolve a program to its installation directory

Modified: accumulo/trunk/bin/bootstrap_hdfs.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/bootstrap_hdfs.sh?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/bin/bootstrap_hdfs.sh (original)
+++ accumulo/trunk/bin/bootstrap_hdfs.sh Wed May  8 22:06:37 2013
@@ -74,10 +74,10 @@ fi
 #
 # We need two of the jars in lib, copy them back out and remove them from the system context dir
 #
-"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
-"$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2-2.0.jar"  > /dev/null
-"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start-${ACCUMULO_VERSION}.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
-"$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start-${ACCUMULO_VERSION}.jar"  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/commons-vfs2.jar"  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -copyToLocal "$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start.jar" "$ACCUMULO_HOME/lib/."  > /dev/null
+"$HADOOP_PREFIX/bin/hadoop" fs -rmr "$SYSTEM_CONTEXT_HDFS_DIR/accumulo-start.jar"  > /dev/null
 for f in `cat $ACCUMULO_HOME/conf/slaves`
 do
   rsync -ra --delete $ACCUMULO_HOME `dirname $ACCUMULO_HOME`

Modified: accumulo/trunk/bin/config.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/config.sh?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/bin/config.sh (original)
+++ accumulo/trunk/bin/config.sh Wed May  8 22:06:37 2013
@@ -52,10 +52,6 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null
 
 export ACCUMULO_LOG_DIR
 
-if [ -z "${ACCUMULO_VERSION}" ]; then
-   ACCUMULO_VERSION=1.6.0-SNAPSHOT
-fi
-
 if [ -z "$HADOOP_PREFIX" ]
 then
    HADOOP_PREFIX="`which hadoop`"

Modified: accumulo/trunk/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/stop-all.sh?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/bin/stop-all.sh (original)
+++ accumulo/trunk/bin/stop-all.sh Wed May  8 22:06:37 2013
@@ -45,10 +45,10 @@ sleep 5
 #look for master and gc processes not killed by 'admin stopAll'
 for signal in TERM KILL ; do
    for master in `grep -v '^#' "$ACCUMULO_HOME/conf/masters"`; do
-      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/.*/accumulo-start.*.jar" master $signal
+      ${bin}/stop-server.sh $master "$ACCUMULO_HOME/lib/accumulo-start.jar" master $signal
    done
 
-   ${bin}/stop-server.sh "$GC" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" gc $signal
+   ${bin}/stop-server.sh "$GC" "$ACCUMULO_HOME/lib/accumulo-start.jar" gc $signal
 
    ${bin}/stop-server.sh "$MONITOR" "$ACCUMULO_HOME/.*/accumulo-start.*.jar" monitor $signal
 

Modified: accumulo/trunk/bin/stop-here.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/stop-here.sh?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/bin/stop-here.sh (original)
+++ accumulo/trunk/bin/stop-here.sh Wed May  8 22:06:37 2013
@@ -31,7 +31,7 @@ bin="$( cd -P "$( dirname "$SOURCE" )" &
 
 . "$bin"/config.sh
 
-ACCUMULO="$ACCUMULO_HOME/.*/accumulo-start.*.jar"
+ACCUMULO="$ACCUMULO_HOME/lib/accumulo-start.jar"
 
 if egrep -q localhost\|127.0.0.1 $ACCUMULO_HOME/conf/slaves; then
    $bin/accumulo admin stop localhost

Modified: accumulo/trunk/bin/tdown.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/tdown.sh?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/bin/tdown.sh (original)
+++ accumulo/trunk/bin/tdown.sh Wed May  8 22:06:37 2013
@@ -34,7 +34,7 @@ SLAVE_HOSTS=$(egrep -v '(^#|^\s*$)' "${S
 echo "Stopping unresponsive tablet servers (if any)..."
 for server in ${SLAVE_HOSTS}; do
    # only start if there's not one already running
-   $ACCUMULO_HOME/bin/stop-server.sh $server "$ACCUMULO_HOME/.*/accumulo-start.*.jar" tserver TERM & 
+   $ACCUMULO_HOME/bin/stop-server.sh $server "$ACCUMULO_HOME/lib/accumulo-start.jar" tserver TERM & 
 done
 
 sleep 10
@@ -42,7 +42,7 @@ sleep 10
 echo "Stopping unresponsive tablet servers hard (if any)..."
 for server in ${SLAVE_HOSTS}; do
    # only start if there's not one already running
-   $ACCUMULO_HOME/bin/stop-server.sh $server "$ACCUMULO_HOME/.*/accumulo-start.*.jar" tserver KILL & 
+   $ACCUMULO_HOME/bin/stop-server.sh $server "$ACCUMULO_HOME/lib/accumulo-start.jar" tserver KILL & 
 done
 
 echo "Cleaning tablet server entries from zookeeper"

Modified: accumulo/trunk/bin/tool.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/bin/tool.sh?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/bin/tool.sh (original)
+++ accumulo/trunk/bin/tool.sh Wed May  8 22:06:37 2013
@@ -36,51 +36,20 @@ if [ -z "$ZOOKEEPER_HOME" ] ; then
    exit 1
 fi
 
-LIB=$ACCUMULO_HOME/lib
-
 ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/zookeeper-[0-9]*[^csn].jar '
-CORE_CMD='ls -1 $LIB/accumulo-core-*[^cs].jar'
-FATE_CMD='ls -1 $LIB/accumulo-fate-*[^cs].jar'
-THRIFT_CMD='ls -1 $LIB/libthrift-*[^cs].jar'
-TRACE_CMD='ls -1 $LIB/accumulo-trace-*[^cs].jar'
-JCOMMANDER_CMD='ls -1 $LIB/jcommander-*[^cs].jar'
-
 if [ `eval $ZOOKEEPER_CMD | wc -l` != "1" ] ; then
    echo "Not exactly one zookeeper jar in $ZOOKEEPER_HOME"
    exit 1
 fi
-
-if [ `eval $CORE_CMD | wc -l` != "1" ] ; then
-   echo "Not exactly one accumulo-core jar in $LIB"
-   exit 1
-fi
-
-if [ `eval $FATE_CMD | wc -l` != "1" ] ; then
-   echo "Not exactly one accumulo-fate jar in $LIB"
-   exit 1
-fi
-
-if [ `eval $THRIFT_CMD | wc -l` != "1" ] ; then
-   echo "Not exactly one thrift jar in $LIB"
-   exit 1
-fi
-
-if [ `eval $TRACE_CMD | wc -l` != "1" ] ; then
-   echo "Not exactly one trace jar in $LIB"
-   exit 1
-fi
-
-if [ `eval $JCOMMANDER_CMD | wc -l` != "1" ] ; then
-    echo "Not exactly one jcommander jar in $LIB"
-    exit 1
-fi
-
 ZOOKEEPER_LIB=$(eval $ZOOKEEPER_CMD)
-CORE_LIB=$(eval $CORE_CMD)
-FATE_LIB=$(eval $FATE_CMD)
-THRIFT_LIB=$(eval $THRIFT_CMD)
-TRACE_LIB=$(eval $TRACE_CMD)
-JCOMMANDER_LIB=$(eval $JCOMMANDER_CMD)
+
+LIB="$ACCUMULO_HOME/lib"
+CORE_LIB="$LIB/accumulo-core.jar"
+FATE_LIB="$LIB/accumulo-fate.jar"
+THRIFT_LIB="$LIB/libthrift.jar"
+TRACE_LIB="$LIB/accumulo-trace.jar"
+JCOMMANDER_LIB="$LIB/jcommander.jar"
+COMMONS_VFS_LIB="$LIB/commons-vfs2.jar"
 
 USERJARS=" "
 for arg in "$@"; do
@@ -101,15 +70,14 @@ for arg in "$@"; do
    fi
 done
 
-LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB"
-H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB:"
+LIB_JARS="$THRIFT_LIB,$CORE_LIB,$FATE_LIB,$ZOOKEEPER_LIB,$TRACE_LIB,$JCOMMANDER_LIB,$COMMONS_VFS_LIB"
+H_JARS="$THRIFT_LIB:$CORE_LIB:$FATE_LIB:$ZOOKEEPER_LIB:$TRACE_LIB:$JCOMMANDER_LIB,$COMMONS_VFS_LIB"
 
-COMMONS_LIBS=`ls -1 $LIB/commons-*.jar`
-for jar in $USERJARS $COMMONS_LIBS; do
+for jar in $USERJARS; do
    LIB_JARS="$LIB_JARS,$jar"
-   H_JARS="$H_JARS$jar:"
+   H_JARS="$H_JARS:$jar"
 done
-export HADOOP_CLASSPATH=$H_JARS$HADOOP_CLASSPATH
+export HADOOP_CLASSPATH="$H_JARS:$HADOOP_CLASSPATH"
 
 if [ -z "$CLASSNAME" -o -z "$TOOLJAR" ]; then
    echo "Usage: tool.sh path/to/myTool.jar my.tool.class.Name [-libjars my1.jar,my2.jar]" 1>&2

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=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/1GB/native-standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -38,7 +38,8 @@
     <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],
+      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>
@@ -96,12 +97,15 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
       $ACCUMULO_HOME/lib/[^.].*.jar,
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
       $HADOOP_CONF_DIR,

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=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/1GB/standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -38,7 +38,8 @@
     <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],
+      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>
@@ -91,12 +92,15 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
       $ACCUMULO_HOME/lib/[^.].*.jar,
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
       $HADOOP_CONF_DIR,

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=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/2GB/native-standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -38,7 +38,8 @@
     <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],
+      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>
@@ -86,12 +87,15 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
       $ACCUMULO_HOME/lib/[^.].*.jar,
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
       $HADOOP_CONF_DIR,

Modified: accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/2GB/standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -82,8 +82,8 @@
       <value>512M</value>
     </property>
 
-    <property>
-      <name>general.classpaths</name>
+  <property>
+    <name>general.classpaths</name>
     <!--
        Add the following for hadoop-2.0
        $HADOOP_PREFIX/share/hadoop/common/.*.jar,
@@ -92,22 +92,25 @@
        $HADOOP_PREFIX/share/hadoop/mapreduce/.*.jar,
        $HADOOP_PREFIX/share/hadoop/yarn/.*.jar,
     -->
-      <value>
-    $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.
+    <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>

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=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/3GB/native-standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -38,7 +38,8 @@
     <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],
+      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>
@@ -81,12 +82,15 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
       $ACCUMULO_HOME/lib/[^.].*.jar,
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
       $HADOOP_CONF_DIR,

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=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/3GB/standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -38,7 +38,8 @@
     <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],
+      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>
@@ -81,12 +82,15 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
       $ACCUMULO_HOME/lib/[^.].*.jar,
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
       $HADOOP_CONF_DIR,

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=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/512MB/native-standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -38,7 +38,8 @@
     <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],
+      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>
@@ -91,12 +92,15 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $ACCUMULO_HOME/lib/accumulo-proxy.jar,
       $ACCUMULO_HOME/lib/[^.].*.jar,
       $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
       $HADOOP_CONF_DIR,

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=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/512MB/standalone/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -95,19 +95,23 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $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>Classpaths that accumulo checks for updates and class files.
+      When using the Security Manager, please remove the ".../target/classes/" values.
     </description>
   </property>
 </configuration>

Modified: accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml (original)
+++ accumulo/trunk/conf/examples/vfs-classloader/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -38,7 +38,8 @@
     <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],
+      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>
@@ -91,15 +92,20 @@
     -->
     <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/examples/target/classes/,
-      $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
+      $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_HOME/conf,
-      $HADOOP_HOME/[^.].*.jar,
-      $HADOOP_HOME/lib/[^.].*.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.
@@ -117,15 +123,17 @@
   <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>
+    <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>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>
 
@@ -146,7 +154,8 @@
   <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>
+    <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>

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/core:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Modified: accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html (original)
+++ accumulo/trunk/core/src/main/resources/org/apache/accumulo/core/conf/config.html Wed May  8 22:06:37 2013
@@ -56,7 +56,7 @@
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: ac14
     - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
     - 

Modified: accumulo/trunk/core/src/test/resources/disabled/conf/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/test/resources/disabled/conf/accumulo-site.xml?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/core/src/test/resources/disabled/conf/accumulo-site.xml (original)
+++ accumulo/trunk/core/src/test/resources/disabled/conf/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -1,14 +1,20 @@
 <?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. -->
+<!--
+  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>
@@ -17,92 +23,105 @@
 		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>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>
+  <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>
-		<value>
-			$ACCUMULO_HOME/server/target/classes/,
-			$ACCUMULO_HOME/core/target/classes/,
-			$ACCUMULO_HOME/start/target/classes/,
-			$ACCUMULO_HOME/examples/target/classes/,
-			$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
-			$ACCUMULO_HOME/lib/[^.].*.jar,
-			$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-			$HADOOP_HOME/conf,
-			$HADOOP_HOME/[^.].*.jar,
-			$HADOOP_HOME/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>
+    <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,
+    -->
+    <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 -->
-	<property>
-		<name>vfs.classloader.enabled</name>
-		<value>true</value>
-	</property>
+  <property>
+    <name>vfs.classloader.enabled</name>
+    <value>true</value>
+  </property>
 
 </configuration>

Modified: accumulo/trunk/docs/combiners.html
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/combiners.html?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/combiners.html (original)
+++ accumulo/trunk/docs/combiners.html Wed May  8 22:06:37 2013
@@ -30,7 +30,7 @@
 <p><pre>
 
 Shell - Apache Accumulo Interactive Shell
-- version: 1.6.0-SNAPSHOT
+- version: 1.5.0
 - instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
 - 
 - type 'help' for a list of available commands

Modified: accumulo/trunk/docs/examples/README.bloom
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.bloom?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.bloom (original)
+++ accumulo/trunk/docs/examples/README.bloom Wed May  8 22:06:37 2013
@@ -24,7 +24,7 @@ Below table named bloom_test is created 
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 
@@ -102,7 +102,7 @@ The commands for creating the first tabl
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 
@@ -125,7 +125,7 @@ The commands for creating the second tab
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: accumulo/trunk/docs/examples/README.combiner
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.combiner?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.combiner (original)
+++ accumulo/trunk/docs/examples/README.combiner Wed May  8 22:06:37 2013
@@ -29,7 +29,7 @@ tar distribution.
     
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: accumulo/trunk/docs/examples/README.constraints
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.constraints?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.constraints (original)
+++ accumulo/trunk/docs/examples/README.constraints Wed May  8 22:06:37 2013
@@ -31,7 +31,7 @@ the end shows the inserts were not allow
     
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: accumulo/trunk/docs/examples/README.mapred
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.mapred?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.mapred (original)
+++ accumulo/trunk/docs/examples/README.mapred Wed May  8 22:06:37 2013
@@ -33,7 +33,7 @@ for the column family count.
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: accumulo/trunk/docs/examples/README.maxmutation
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.maxmutation?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.maxmutation (original)
+++ accumulo/trunk/docs/examples/README.maxmutation Wed May  8 22:06:37 2013
@@ -27,7 +27,7 @@ large mutations.
     
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: accumulo/trunk/docs/examples/README.regex
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.regex?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.regex (original)
+++ accumulo/trunk/docs/examples/README.regex Wed May  8 22:06:37 2013
@@ -24,7 +24,7 @@ put a trivial amount of data into accumu
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: accumulo/trunk/docs/examples/README.rowhash
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.rowhash?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.rowhash (original)
+++ accumulo/trunk/docs/examples/README.rowhash Wed May  8 22:06:37 2013
@@ -24,7 +24,7 @@ put a trivial amount of data into accumu
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 
@@ -44,7 +44,7 @@ Now we can scan the table and see the ha
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Modified: accumulo/trunk/docs/examples/README.tabletofile
URL: http://svn.apache.org/viewvc/accumulo/trunk/docs/examples/README.tabletofile?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/docs/examples/README.tabletofile (original)
+++ accumulo/trunk/docs/examples/README.tabletofile Wed May  8 22:06:37 2013
@@ -23,7 +23,7 @@ put a trivial amount of data into accumu
 
     $ ./bin/accumulo shell -u username -p password
     Shell - Apache Accumulo Interactive Shell
-    - version: 1.6.0-SNAPSHOT
+    - version: 1.5.0
     - instance name: instance
     - instance id: 00000000-0000-0000-0000-000000000000
     - 

Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/examples:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Modified: accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Wed May  8 22:06:37 2013
@@ -596,6 +596,7 @@
             <configuration>
               <outputDirectory>../lib</outputDirectory>
               <!-- just grab the non-provided runtime dependencies -->
+              <stripVersion>true</stripVersion>
               <includeScope>runtime</includeScope>
               <excludeTransitive>true</excludeTransitive>
               <excludeClassifiers>sources,test-sources</excludeClassifiers>

Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/pom.xml:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/proxy/README:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/server:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Modified: accumulo/trunk/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/c++/nativeMap/Makefile (original)
+++ accumulo/trunk/server/src/main/c++/nativeMap/Makefile Wed May  8 22:06:37 2013
@@ -56,7 +56,7 @@ clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
 org_apache_accumulo_server_tabletserver_NativeMap.h : ../../java/org/apache/accumulo/server/tabletserver/NativeMap.java
-	javah -classpath ../../../../../lib/accumulo-server-1.6.0-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+	javah -classpath ../../../../../lib/accumulo-server.jar org.apache.accumulo.server.tabletserver.NativeMap
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
 	cp $(LIBS) $(INSTALL_DIR)

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.5/src:r1480096-1480117,1480119-1480269,1480271-1480273,1480275-1480289,1480291-1480407,1480409-1480468,1480470-1480477

Modified: accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml (original)
+++ accumulo/trunk/test/compat/japi-compliance/japi-accumulo-1.5.xml Wed May  8 22:06:37 2013
@@ -15,11 +15,11 @@
   limitations under the License.
 -->
 <version>
-  1.6.0-SNAPSHOT
+  1.6.0
 </version>
 
 <archives>
-  ../../../lib/accumulo-core-1.6.0-SNAPSHOT.jar
+  ../../../lib/accumulo-core.jar
 </archives>
 
 <skip_packages>

Modified: accumulo/trunk/test/src/test/resources/conf/accumulo-site.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/test/resources/conf/accumulo-site.xml?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/test/src/test/resources/conf/accumulo-site.xml (original)
+++ accumulo/trunk/test/src/test/resources/conf/accumulo-site.xml Wed May  8 22:06:37 2013
@@ -28,82 +28,96 @@
   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>
+  <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>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>
-    $ACCUMULO_HOME/server/target/classes/,
-    $ACCUMULO_HOME/core/target/classes/,
-    $ACCUMULO_HOME/start/target/classes/,
-    $ACCUMULO_HOME/examples/target/classes/,
-	$ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar,
-	$ACCUMULO_HOME/lib/[^.].*.jar,
-	$ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-	$HADOOP_HOME/conf,
-	$HADOOP_HOME/[^.].*.jar,
-	$HADOOP_HOME/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>
+    <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,
+    -->
+    <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>
 </configuration>

Modified: accumulo/trunk/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/TestUtils.py?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/TestUtils.py (original)
+++ accumulo/trunk/test/system/auto/TestUtils.py Wed May  8 22:06:37 2013
@@ -50,10 +50,13 @@ LOG_MONITOR = os.path.join(ACCUMULO_HOME
 General_CLASSPATH = """
 $ACCUMULO_HOME/server/target/classes/,
     $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/examples/instamo/target/classes,
+    $ACCUMULO_HOME/lib/accumulo-fate.jar,
     $ACCUMULO_HOME/examples/simple/target/classes,
+    $ACCUMULO_HOME/lib/accumulo-examples-simple.jar,
         $ACCUMULO_HOME/lib/[^.].*.jar,
         $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
         $HADOOP_CONF_DIR,

Modified: accumulo/trunk/test/system/auto/simple/mapreduce.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/simple/mapreduce.py?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/simple/mapreduce.py (original)
+++ accumulo/trunk/test/system/auto/simple/mapreduce.py Wed May  8 22:06:37 2013
@@ -64,13 +64,13 @@ class MapReduceTest(TestUtilsMixin,unitt
     
     def runTest(self):
         #These Environment variables are need to run this test it will fail if they are not in the environment
-        thriftjar = globa(os.path.join('lib','libthrift*.jar'))
-        examples = globa(os.path.join('lib','accumulo-examples-simple*[!javadoc|sources].jar'))
-        core = globa(os.path.join('lib','accumulo-core*[!javadoc|sources].jar'))
-        fate = globa(os.path.join('lib','accumulo-fate*[!javadoc|sources].jar'))
-        start = globa(os.path.join('lib','accumulo-start*[!javadoc|sources].jar'))
-        jcommander = globa(os.path.join('lib','jcommander*[!javadoc|sources].jar'))
-        trace = globa(os.path.join('lib','accumulo-trace*[!javadoc|sources].jar'))
+        thriftjar = globa(os.path.join('lib','libthrift.jar'))
+        examples = globa(os.path.join('lib','accumulo-examples-simple.jar'))
+        core = globa(os.path.join('lib','accumulo-core.jar'))
+        fate = globa(os.path.join('lib','accumulo-fate.jar'))
+        start = globa(os.path.join('lib','accumulo-start.jar'))
+        jcommander = globa(os.path.join('lib','jcommander.jar'))
+        trace = globa(os.path.join('lib','accumulo-trace.jar'))
         zkjar = globbase(os.getenv("ZOOKEEPER_HOME"),"zookeeper*[!javadoc|src|bin].jar")
         self.createInputTableInAccumulo();
         #Arguments for the Example Class

Modified: accumulo/trunk/test/system/bench/lib/Benchmark.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/bench/lib/Benchmark.py?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/test/system/bench/lib/Benchmark.py (original)
+++ accumulo/trunk/test/system/bench/lib/Benchmark.py Wed May  8 22:06:37 2013
@@ -96,15 +96,15 @@ class Benchmark(unittest.TestCase):
         
     # Returns the location of the local examples jar
     def getexamplejar(self):
-        return self.findjar(accumulo() + '/lib/examples-simple*.jar')
+        return self.findjar(accumulo() + '/lib/accumulo-examples-simple.jar')
     
     # Returns a string of core, thrift and zookeeper jars with a specified delim
     def getjars(self, delim=','):
-        accumulo_core_jar = self.findjar(accumulo('lib', 'accumulo-core*.jar'))
-        accumulo_start_jar = self.findjar(accumulo('lib', 'accumulo-start*.jar'))
-        accumulo_fate_jar = self.findjar(accumulo('lib', 'accumulo-fate*.jar'))
-        accumulo_trace_jar = self.findjar(accumulo('lib', 'accumulo-trace*.jar'))
-        accumulo_thrift_jar = self.findjar(accumulo('lib', 'libthrift*.jar'))
+        accumulo_core_jar = self.findjar(accumulo('lib', 'accumulo-core.jar'))
+        accumulo_start_jar = self.findjar(accumulo('lib', 'accumulo-start.jar'))
+        accumulo_fate_jar = self.findjar(accumulo('lib', 'accumulo-fate.jar'))
+        accumulo_trace_jar = self.findjar(accumulo('lib', 'accumulo-trace.jar'))
+        accumulo_thrift_jar = self.findjar(accumulo('lib', 'libthrift.jar'))
         accumulo_zookeeper_jar = self.findjar(os.path.join(os.getenv('ZOOKEEPER_HOME'), 'zookeeper*.jar'))
         return delim.join([accumulo_core_jar, accumulo_thrift_jar, accumulo_zookeeper_jar, accumulo_start_jar,
             accumulo_fate_jar, accumulo_trace_jar])

Modified: accumulo/trunk/test/system/continuous/agitator.pl
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/agitator.pl?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/agitator.pl (original)
+++ accumulo/trunk/test/system/continuous/agitator.pl Wed May  8 22:06:37 2013
@@ -119,7 +119,7 @@ while(1){
 	
 		print STDERR "$t Killing $server $kill_tserver $kill_datanode\n";
 	        if($kill_tserver) {
-			system("$ACCUMULO_HOME/bin/stop-server.sh $server \"accumulo-start.*.jar\" tserver KILL");
+			system("$ACCUMULO_HOME/bin/stop-server.sh $server \"accumulo-start.jar\" tserver KILL");
 		}
 
 	        if($kill_datanode) {

Modified: accumulo/trunk/test/system/continuous/mapred-setup.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/continuous/mapred-setup.sh?rev=1480486&r1=1480485&r2=1480486&view=diff
==============================================================================
--- accumulo/trunk/test/system/continuous/mapred-setup.sh (original)
+++ accumulo/trunk/test/system/continuous/mapred-setup.sh Wed May  8 22:06:37 2013
@@ -21,11 +21,4 @@
 . continuous-env.sh
 . $ACCUMULO_HOME/conf/accumulo-env.sh
 
-SERVER_CMD='ls -1 $ACCUMULO_HOME/lib/accumulo-test-*[!javadoc\|sources].jar'
-
-if [ `eval $SERVER_CMD | wc -l` != "1" ] ; then
-    echo "Not exactly one accumulo-test jar in $ACCUMULO_HOME/lib"
-    exit 1
-fi
-
-SERVER_LIBJAR=`eval $SERVER_CMD`
+SERVER_LIBJAR="$ACCUMULO_HOME/lib/accumulo-test.jar"



Mime
View raw message